Index: projects/clang800-import/ObsoleteFiles.inc
===================================================================
--- projects/clang800-import/ObsoleteFiles.inc	(revision 344548)
+++ projects/clang800-import/ObsoleteFiles.inc	(revision 344549)
@@ -1,10945 +1,10948 @@
 #
 # $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.
 #
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 # 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
 
 # 2019mmdd: new libc++ import which bumps version from 7.0.1 to 8.0.0.
 OLD_FILES+=usr/include/c++/v1/experimental/dynarray
 # 2019mmdd: 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
+# 20190222: libifconfig made INTERNALLIB
+OLD_FILES+=/usr/lib/libprivateifconfig.a
+OLD_FILES+=/usr/lib/libprivateifconfig_p.a
 # 20190131: pfil(9) changed
 OLD_FILES+=usr/share/man/man9/pfil_hook_get.9
 OLD_FILES+=usr/share/man/man9/pfil_rlock.9
 OLD_FILES+=usr/share/man/man9/pfil_runlock.9
 OLD_FILES+=usr/share/man/man9/pfil_wlock.9
 OLD_FILES+=usr/share/man/man9/pfil_wunlock.9
 # 20190126: adv(4) / adw(4) removal
 OLD_FILES+=usr/share/man/man4/adv.4.gz
 OLD_FILES+=usr/share/man/man4/adw.4.gz
 # 20190114: old pbuf allocator removed
 OLD_FILES+=usr/share/man/man9/pbuf.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
 # 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/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
 # 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
 # 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
 # 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
 # 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
 # 20170322: garbage collect old references to igb(4)
 OLD_FILES+=usr/share/man/man4/if_igb.4.gz
 OLD_FILES+=usr/share/man/man4/igb.4.gz
 # 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
 # 20150518: tzdata2015c update
 OLD_FILES+=usr/share/zoneinfo/America/Montreal
 # 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
 # 20140827: tzdata2014f import
 OLD_FILES+=usr/share/zoneinfo/Asia/Chongqing
 OLD_FILES+=usr/share/zoneinfo/Asia/Harbin
 OLD_FILES+=usr/share/zoneinfo/Asia/Kashgar
 # 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
 # 20131105: tzdata 2013h import
 OLD_FILES+=usr/share/zoneinfo/America/Shiprock
 OLD_FILES+=usr/share/zoneinfo/Antarctica/South_Pole
 # 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
 # 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
 # 20130110: bsd.compat.mk removed
 OLD_FILES+=usr/share/mk/bsd.compat.mk
 # 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
 # 20100801: tzdata2010k import
 OLD_FILES+=usr/share/zoneinfo/Pacific/Ponape
 OLD_FILES+=usr/share/zoneinfo/Pacific/Truk
 # 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
 # 20090122: tzdata2009a import
 OLD_FILES+=usr/share/zoneinfo/Asia/Katmandu
 # 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
 # 20080325: tzdata2008b import
 OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
 OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
 # 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
 # 199911XX
 OLD_FILES+=usr/sbin/ipfstat
 OLD_FILES+=usr/sbin/ipmon
 OLD_FILES+=usr/sbin/ipnat
 OLD_FILES+=usr/sbin/bad144
 OLD_FILES+=usr/sbin/wormcontrol
 OLD_FILES+=usr/sbin/named-bootconf
 OLD_FILES+=usr/sbin/kvm_mkdb
 OLD_FILES+=usr/sbin/keyadmin
 # 199909XX
 OLD_FILES+=usr/lib/libdesrypt_p.a
 OLD_FILES+=sbin/ft
 # 199903XX
 OLD_FILES+=sbin/modload
 OLD_FILES+=sbin/modunload
 OLD_FILES+=usr/sbin/natd
 # 199812XX
 OLD_FILES+=sbin/dset
 # 199809XX
 OLD_FILES+=sbin/scsi
 OLD_FILES+=sbin/scsiformat
 OLD_FILES+=usr/sbin/ncrcontrol
 OLD_FILES+=usr/sbin/tickadj
 # 199806XX
 OLD_FILES+=usr/sbin/mkdosfs
 # 199801XX
 OLD_FILES+=sbin/mount_lfs
 OLD_FILES+=sbin/newlfs
 OLD_FILES+=sbin/dumplfs
 OLD_FILES+=usr/sbin/qcamcontrol
 OLD_FILES+=usr/sbin/supscan
 # 1997XXXX
 OLD_FILES+=usr/sbin/sysctl
 OLD_FILES+=usr/sbin/ctm_scan
 OLD_FILES+=usr/sbin/addgroup
 OLD_FILES+=usr/sbin/rmgroup
 # 1996XXXX
 OLD_FILES+=sbin/rdisc
 OLD_FILES+=usr/sbin/cdplay
 OLD_FILES+=usr/sbin/supfilesrv
 OLD_FILES+=usr/sbin/routed
 OLD_FILES+=usr/sbin/lsdev
 OLD_FILES+=usr/sbin/yppasswdd
 ## 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/bin/sperl5
 OLD_FILES+=usr/bin/perl5.6.0
 OLD_FILES+=usr/bin/sperl5.6.0
 OLD_FILES+=usr/bin/perlbc
 OLD_FILES+=usr/bin/perl5.00503
 OLD_FILES+=usr/bin/sperl5.00503
 OLD_FILES+=usr/bin/perlbug
 OLD_FILES+=usr/bin/perlcc
 OLD_FILES+=usr/bin/perldoc
 OLD_FILES+=usr/bin/suidperl
 OLD_FILES+=usr/lib/pam_ftp.so
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Apache.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Carp.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Cookie.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Fast.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Push.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI/Switch.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CPAN/FirstTime.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CPAN/Nox.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Class/Struct.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Devel/SelfStubber.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Command.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Embed.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Install.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Installed.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Liblist.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MM_OS2.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MM_Unix.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MM_VMS.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MM_Win32.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/MakeMaker.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Manifest.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Mkbootstrap.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Mksymlists.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/Packlist.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/inst
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/testlib.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/typemap
 OLD_FILES+=usr/libdata/perl/5.00503/ExtUtils/xsubpp
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/Mac.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/OS2.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/Unix.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/VMS.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec/Win32.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Basename.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/CheckTree.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Compare.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Copy.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/DosGlob.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Find.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Path.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/Spec.pm
 OLD_FILES+=usr/libdata/perl/5.00503/File/stat.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Getopt/Long.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Getopt/Std.pm
 OLD_FILES+=usr/libdata/perl/5.00503/I18N/Collate.pm
 OLD_FILES+=usr/libdata/perl/5.00503/IPC/Open2.pm
 OLD_FILES+=usr/libdata/perl/5.00503/IPC/Open3.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Math/BigFloat.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Math/BigInt.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Math/Complex.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Math/Trig.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/Ping.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/hostent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/netent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/protoent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Net/servent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Pod/Functions.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Pod/Html.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Pod/Text.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Search/Dict.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Sys/Hostname.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Sys/Syslog.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Term/Cap.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Term/Complete.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Term/ReadLine.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Test/Harness.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/Abbrev.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/ParseWords.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/Soundex.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/Tabs.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Text/Wrap.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/Array.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/Handle.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/Hash.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/RefHash.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/Scalar.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Tie/SubstrHash.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Time/Local.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Time/gmtime.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Time/localtime.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Time/tm.pm
 OLD_FILES+=usr/libdata/perl/5.00503/User/grent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/User/pwent.pm
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/GetOptions.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/FindOption.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/Configure.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/config.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/Croak.al
 OLD_FILES+=usr/libdata/perl/5.00503/auto/Getopt/Long/autosplit.ix
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Deparse.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/CC.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Debug.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Showlex.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/makeliblinks
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Bblock.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/cc_harness
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Bytecode.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Stackobj.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Xref.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Lint.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Asmdata.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Assembler.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Disassembler.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/disassemble
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/assemble
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/Terse.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B/C.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/EXTERN.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/INTERN.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/XSUB.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/XSlock.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/av.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/bytecode.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/byterun.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/cc_runtime.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/config.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/cop.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/cv.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/dosish.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/embed.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/embedvar.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/fakethr.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/form.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/gv.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/handy.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/hv.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/intrpvar.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/iperlsys.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/keywords.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/mg.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/nostdio.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/objXSUB.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/objpp.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/op.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/opcode.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/patchlevel.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perl.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perlio.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perlsdio.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perlsfio.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perlvars.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/perly.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/pp.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/pp_proto.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/proto.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/regcomp.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/regexp.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/regnodes.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/scope.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/sv.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/thrdvar.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/thread.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/unixish.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/CORE/util.h
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Data/Dumper.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Select.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Socket.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Handle.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Seekable.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO/Pipe.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IPC/SysV.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IPC/Msg.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IPC/Semaphore.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/B/B.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/B/B.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/B/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DB_File/autosplit.ix
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DB_File/DB_File.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DB_File/DB_File.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DB_File/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Data/Dumper/Dumper.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Data/Dumper/Dumper.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Data/Dumper/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/.exists
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/dl_findfile.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/dl_expandspec.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/dl_find_symbol_anywhere.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/autosplit.ix
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/DynaLoader.a
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/DynaLoader/extralibs.ld
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Fcntl/Fcntl.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Fcntl/Fcntl.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Fcntl/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IO/IO.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IO/IO.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IO/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IPC/SysV/SysV.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IPC/SysV/SysV.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/IPC/SysV/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/NDBM_File/NDBM_File.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/NDBM_File/NDBM_File.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/NDBM_File/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Opcode/Opcode.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Opcode/Opcode.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Opcode/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/assert.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/tolower.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/toupper.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/closedir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/opendir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/readdir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rewinddir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/errno.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/creat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fcntl.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getgrgid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getgrnam.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atan2.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/cos.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/exp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fabs.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/log.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/pow.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sin.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sqrt.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getpwnam.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getpwuid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/longjmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setjmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/kill.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/feof.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/siglongjmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sigsetjmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/raise.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/offsetof.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/clearerr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fclose.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fdopen.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fgetc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fgets.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fileno.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fopen.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fputc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fputs.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fread.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/freopen.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fscanf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fseek.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/ferror.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fflush.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fgetpos.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fsetpos.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/ftell.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fwrite.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getchar.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/gets.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/perror.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/printf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/putc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/putchar.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/puts.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/remove.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rename.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rewind.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/scanf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sscanf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/tmpfile.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/ungetc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/vfprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/vprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/vsprintf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/abs.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atexit.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atof.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atoi.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/atol.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/bsearch.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/calloc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/div.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/exit.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/free.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getenv.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/labs.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/ldiv.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/malloc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/qsort.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rand.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/realloc.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/srand.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/system.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memchr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memcmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memcpy.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memmove.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/memset.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strcat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strchr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strcmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strcpy.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strcspn.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strerror.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strlen.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strncat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strncmp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strncpy.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strpbrk.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strrchr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strspn.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strstr.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/strtok.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/chmod.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fstat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/mkdir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/stat.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/umask.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/wait.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/waitpid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/gmtime.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/localtime.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/time.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/alarm.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/chdir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/chown.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execl.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execle.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execlp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execv.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execve.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/execvp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/fork.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getcwd.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getegid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/geteuid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getgid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getgroups.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getlogin.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getpgrp.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getpid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getppid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/getuid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/isatty.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/link.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/rmdir.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setbuf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setgid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setuid.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/setvbuf.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/sleep.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/unlink.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/utime.al
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/autosplit.ix
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/POSIX.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/POSIX.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/POSIX/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/SDBM_File/SDBM_File.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/SDBM_File/SDBM_File.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/SDBM_File/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Socket/Socket.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Socket/Socket.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Socket/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/attrs/attrs.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/attrs/attrs.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/attrs/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/re/re.so
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/re/re.bs
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/re/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/sdbm/extralibs.ld
 OLD_FILES+=usr/libdata/perl/5.00503/mach/auto/Errno/.packlist
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Config.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/B.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/O.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/perllocal.pod
 OLD_FILES+=usr/libdata/perl/5.00503/mach/DB_File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Errno.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Fcntl.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/IO.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/NDBM_File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Safe.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Opcode.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ops.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/POSIX.pod
 OLD_FILES+=usr/libdata/perl/5.00503/mach/POSIX.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/SDBM_File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/Socket.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/attrs.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/re.pm
 OLD_FILES+=usr/libdata/perl/5.00503/mach/_h2ph_pre.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/a.out.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_ccb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_extend.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_periph.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_queue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_sim.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_xpt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_xpt_periph.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/cam/cam_xpt_sim.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/aio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/alias.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/assert.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/bitstring.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/calendar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/camlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/com_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/com_right.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ctype.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/curses.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/db.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/des.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/devstat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/dialog.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/dirent.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/disktab.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/dlfcn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/elf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/errno.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/eti.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fcntl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fetch.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/float.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/floatingpoint.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fnmatch.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/form.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fstab.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ftpio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/fts.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/glob.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/gmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/gnuregex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/grp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/histedit.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ieeefp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ifaddrs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/inttypes.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/iso646.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/kvm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libatm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libdisk.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libgen.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libusb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libutil.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/limits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/link.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/linker_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/locale.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/login_cap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/malloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/FlexLexer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/PlotFile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/SFile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/_G_config.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/algo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/algobase.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/alloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/builtinbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/bvector.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/complex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/defalloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/deque.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/editbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/floatio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/fstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/function.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/hash_map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/hash_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/hashtable.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/heap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/indstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iolibio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iomanip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/list.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iostdio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iostream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iostreamP.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/istream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/iterator.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/libio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/libioP.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/multimap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/multiset.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/new.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/ostream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/pair.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/parsestream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/pfstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/procbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/pthread_alloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/rope.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/ropeimpl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/slist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stdiostream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_algo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/tree.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_algobase.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_alloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_bvector.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_config.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_construct.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_deque.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_function.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_hash_fun.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_hash_map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_hash_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_hashtable.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_heap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_iterator.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_list.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_multimap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_multiset.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_numeric.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_pair.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_queue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_raw_storage_iter.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_relops.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_rope.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_slist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_stack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_tempbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_tree.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_uninitialized.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stl_vector.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/stream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/streambuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/strfile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/strstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/tempbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/type_traits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g++/vector.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/math.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/md2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/md4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/md5.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/memory.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/menu.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/mp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/mpool.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/mqueue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ncurses.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ndbm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netdb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nl_types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nlist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objformat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/opie.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/osreldate.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/panel.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/paths.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pcap-int.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pcap-namedb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pcap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/poll.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pthread.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pthread_np.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pwd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/radlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ranlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/regex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/regexp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/resolv.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ripemd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rune.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/runetype.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sched.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/search.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/semaphore.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/setjmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sgtty.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sha.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/signal.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/skey.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stab.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stand.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stdarg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stddef.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stdio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stdlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/strhash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/string.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stringlist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/strings.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/struct.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sysexits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/syslog.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/taclib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/tar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/tcpd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/term.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/termcap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/termios.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/time.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/timers.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ttyent.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ucontext.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/unctrl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/unistd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/utime.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/utmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/values.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/varargs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vgl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vis.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/zconf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/zlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/ftp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/inet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/nameser.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/nameser_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/telnet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/arpa/tftp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/assertions.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/ctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/dst.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/eventlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/heap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/irpmarshall.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/logging.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/memcluster.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/misc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/tree.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/isc/list.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ansi.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/apic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/apm_bios.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/apm_segments.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/asc_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/asm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/asmacros.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/asnames.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/atomic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bootinfo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_at386.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_memio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_pc98.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_pio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_pio_ind.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cdk.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/clock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/comstats.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/console.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cpu.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cpufunc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cputypes.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/cronyx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/db_machdep.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/dvcfg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/elf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/endian.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/exec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/float.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/floatingpoint.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/frame.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/globaldata.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/globals.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/gsc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_cause.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_rbch_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_tel_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_trace.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ieeefp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/if_wavelan_ieee.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/if_wl_wavelan.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/iic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/in_cksum.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ioctl_bt848.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ioctl_ctx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ioctl_fd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ioctl_meteor.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ipl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/joystick.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/limits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/lock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/md_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/mouse.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/mpapic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/mtpr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/bus_dma.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/npx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/param.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pcaudioio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pcb_ext.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pcvt_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/perfmon.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/physio_proc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pmap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/proc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/profile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/psl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ptrace.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/reg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/reloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/resource.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/segments.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/setjmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/sigframe.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/signal.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/smb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/smp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/smptests.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/soundcard.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/speaker.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/specialreg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/spigot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/stdarg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/sysarch.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/trap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/tss.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/uc_device.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ucontext.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/ultrasound.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/varargs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/vm86.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/vmparam.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/wtio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/i4b_isppp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/machine/pci_cfgreg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/bootsect.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/bpb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/denode.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/direntry.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/fat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/msdosfs/msdosfsmount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/bpf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/bpf_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/bpfdesc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/bridge.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/ethernet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/hostcache.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_arp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_atm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_dl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_gif.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_ieee80211.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_llc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_media.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_mib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_ppp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_pppvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_slvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_sppp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_stf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_tap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_tapvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_tun.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/slip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_tunvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_vlan_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/intrq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/iso88025.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/net_osdep.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/netisr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/pfkeyv2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/ppp_comp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/ppp_defs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/radix.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/raw_cb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/route.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/slcompress.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/zlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_faith.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_arc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/net/if_gre.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/krpc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsdiskless.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsm_subs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsmount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsnode.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsproto.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsrtt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsrvcache.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nfsv2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/nqnfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/rpcv2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nfs/xdr_subs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/aarp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/at.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/at_extern.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/at_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/ddp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/ddp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/endian.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatalk/phase2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_cm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_if.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_sap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_sigmgr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_stack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_sys.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/atm_vc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/kern_include.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/port.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netatm/queue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/netgraph.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_UI.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_async.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_bpf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_bridge.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_cisco.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_echo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_ether.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_frame_relay.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_hole.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_iface.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_ksocket.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_lmi.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_message.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_mppc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_one2many.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_parse.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_ppp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_pppoe.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_pptpgre.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_rfc1490.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_sample.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_socket.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_socketvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_tee.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_tty.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_vjc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_eiface.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_etf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_device.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_l2tp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netgraph/ng_fec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/icmp6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/icmp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/if_atm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/if_ether.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/if_fddi.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/igmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/igmp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_gif.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_hostcache.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_systm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/in_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_auth.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_dummynet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_ecn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_encap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_fil.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_flow.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_frag.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_fw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_icmp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_mroute.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_nat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_proxy.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_state.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ipl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ipprotosw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_fsm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_seq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_timer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/tcpip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/udp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/udp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_fw2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet/ip_gre.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ah.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ah6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/esp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/esp6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/icmp6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_gif.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_ifattach.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_prefix.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/in6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6_ecn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6_fw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6_mroute.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ip6protosw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ipcomp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ipcomp6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ipsec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/ipsec6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/mld6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/nd6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/pim6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/pim6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/scope6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/tcp6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/udp6_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/esp_rijndael.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netinet6/raw_ip6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx_if.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx_ip.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/ipx_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/spx.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/spx_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/spx_timer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipx/spx_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/key.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/key_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/key_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/keydb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netkey/keysock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netnatm/natm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_cfg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_conn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_file.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_lib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_ncp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_nls.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_rcfile.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_rq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_sock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_subr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/ncp_user.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netncp/nwerror.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/idp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/idp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/ns.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/ns_error.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/ns_if.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/ns_pcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/sp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/spidp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/spp_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/spp_timer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netns/spp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_compr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_ihash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_inode.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_subr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfs_vfsops.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ntfs/ntfsmount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nwfs/nwfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nwfs/nwfs_mount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nwfs/nwfs_node.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/nwfs/nwfs_subr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/NXConstStr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/Object.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/Protocol.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/encoding.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/hash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/objc-api.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/objc-list.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/objc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/runtime.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/sarray.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/thr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/objc/typedstream.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/asn1.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/asn1_mac.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/bio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/blowfish.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/bn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/buffer.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/cast.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/comp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/conf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/conf_api.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/crypto.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/des.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/dh.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/dsa.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/dso.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/e_os.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/e_os2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ebcdic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/evp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hmac.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/lhash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/md2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/md4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/md5.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/mdc2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/obj_mac.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/objects.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/opensslconf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/opensslv.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/pem.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/pem2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/pkcs12.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/pkcs7.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rand.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rc2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rc4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rc5.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ripemd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/rsa.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/safestack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/sha.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl2.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl23.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl3.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ssl_locl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/stack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/symhacks.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/tls1.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/tmdiff.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/txt_db.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/x509.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/x509_vfy.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/x509v3.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/idea.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/aes.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/asn1t.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/cryptlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/des_old.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/engine.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/krb5_asn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/kssl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ocsp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ossl_typ.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ui.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ui_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/aes_locl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/eng_int.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_4758_cca_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_aep_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_atalla_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_cswift_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_ncipher_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_nuron_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_sureware_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/hw_ubsec_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/openssl/ui_locl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/cardinfo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/cis.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/driver.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/i82365.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/pccard_nbk.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/slot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/meciareg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/pcic_pci.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/pccard/pcicvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/aio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/mqueue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/posix4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/sched.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/posix4/semaphore.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/dumprestore.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/routed.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/rwhod.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/talkd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/protocols/timed.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/chardefs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/history.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/keymaps.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/readline.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/rlconf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/rlstdc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readline/tilde.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/auth.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/auth_des.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/auth_unix.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/clnt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/des.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/des_crypt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/key_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/pmap_clnt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/pmap_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/pmap_rmt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/rpc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/rpc_com.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/rpc_msg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/svc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/svc_auth.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpc/xdr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/bootparam_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/crypt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/key_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/klm_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/mount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nfs_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis_cache.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis_callback.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis_db.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nis_tags.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nislib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/nlm_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rnusers.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rquota.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rstat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/rwall.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/sm_inter.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/spray.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/yp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/yp_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/ypclnt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/yppasswd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/ypupdate_prot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/rpcsvc/ypxfrd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/_pam_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/_pam_macros.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/_pam_types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_appl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_malloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_misc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_mod_misc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/security/pam_modules.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ss/mit-sipb-copyright.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ss/ss.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/ss/ss_err.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/_posix.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ata.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/acct.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/acl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/agpio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/aio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/assym.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/blist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/buf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/bus.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/bus_private.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/callout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ccdvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/cdefs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/cdio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/cdrio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/chio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/clist.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/endian.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/conf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/cons.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/consio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/copyright.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ctype.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dir.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dataacq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/link_elf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/device_port.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/devicestat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dirent.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/disk.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/disklabel.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/diskslice.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dkstat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dmap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/domain.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/dvdio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/elf32.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/elf64.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/elf_common.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/elf_generic.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/errno.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/event.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/eventhandler.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/eventvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/exec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/extattr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/fbio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/fcntl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/file.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/filedesc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/filio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/gmon.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/imgact.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/imgact_aout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/imgact_elf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/inflate.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/interrupt.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/inttypes.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ioccom.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ioctl_compat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ipc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/jail.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/joystick.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/kbio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/kernel.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/kthread.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ktrace.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/libkern.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/linker.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/linker_set.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/lock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/lockf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/malloc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/md5.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/memrange.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mman.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/module.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mount.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/msg.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/msgbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mtio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/namei.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/param.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/pciio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/pioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/pipe.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/poll.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/proc.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/procfs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/protosw.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ptio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ptrace.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/queue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/random.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/reboot.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/resource.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/resourcevar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/rman.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/rtprio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sbuf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/select.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sem.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/shm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/signal.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/signalvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/snoop.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/socket.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/socketvar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sockio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/soundcard.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/stat.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/syscall-hide.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/syscall.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sysctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sysent.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/syslimits.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/syslog.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/sysproto.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/systm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/taskqueue.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/termios.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/time.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/timeb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/timepps.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/timers.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/times.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/timex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/tprintf.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/tty.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ttychars.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ttycom.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ttydefaults.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ttydev.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/types.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ucontext.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/ucred.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/uio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/un.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/unistd.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/unpcb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/user.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/utsname.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/vmmeter.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/vnioctl.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/vnode.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/wait.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/wormio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/xrpuio.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/kobj.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/link_aout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/nlist_aout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/mchain.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/fnv_hash.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/iconv.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/sys/md4.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/pmap.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/swap_pager.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_extern.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_kern.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_map.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_object.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_page.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_pageout.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_pager.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_param.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vm_zone.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/vm/vnode_pager.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/complex.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/stdbool.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/langinfo.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/netbios.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_conn.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_dev.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_rq.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_subr.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_tran.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netsmb/smb_trantcp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/g2c.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/telnet.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/elf-hints.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/libusbhid.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/radlib_vs.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/readpassphrase.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/wchar.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/wctype.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/cast.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/castsb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/cryptodev.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/cryptosoft.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/deflate.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/rijndael.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/rmd160.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/skipjack.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/crypto/xform.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ah.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ah_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/esp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/esp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipcomp.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipcomp_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipip_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipsec.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/ipsec6.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/key.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/key_debug.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/key_var.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/keydb.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/keysock.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/netipsec/xform.ph
 OLD_FILES+=usr/libdata/perl/5.00503/mach/bzlib.ph
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perl.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perl5004delta.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlapio.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlbook.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlbot.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlcall.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldata.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldebug.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldelta.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldiag.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perldsc.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlembed.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq1.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq2.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq3.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq4.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq5.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq6.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq7.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlipc.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq8.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfaq9.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlform.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlfunc.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlguts.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlhist.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perllocale.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perllol.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlmod.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlmodinstall.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlmodlib.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlobj.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlop.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlopentut.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlpod.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlport.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlre.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlref.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlreftut.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlrun.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlsec.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlstyle.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlsub.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlsyn.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlthrtut.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perltie.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perltoc.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perltoot.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perltrap.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlvar.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlxs.pod
 OLD_FILES+=usr/libdata/perl/5.00503/pod/perlxstut.pod
 OLD_FILES+=usr/libdata/perl/5.00503/AnyDBM_File.pm
 OLD_FILES+=usr/libdata/perl/5.00503/AutoLoader.pm
 OLD_FILES+=usr/libdata/perl/5.00503/AutoSplit.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Benchmark.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CGI.pm
 OLD_FILES+=usr/libdata/perl/5.00503/CPAN.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Carp.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Cwd.pm
 OLD_FILES+=usr/libdata/perl/5.00503/DirHandle.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Dumpvalue.pm
 OLD_FILES+=usr/libdata/perl/5.00503/English.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Env.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Exporter.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Fatal.pm
 OLD_FILES+=usr/libdata/perl/5.00503/FileCache.pm
 OLD_FILES+=usr/libdata/perl/5.00503/FileHandle.pm
 OLD_FILES+=usr/libdata/perl/5.00503/FindBin.pm
 OLD_FILES+=usr/libdata/perl/5.00503/SelectSaver.pm
 OLD_FILES+=usr/libdata/perl/5.00503/SelfLoader.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Shell.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Symbol.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Test.pm
 OLD_FILES+=usr/libdata/perl/5.00503/abbrev.pl
 OLD_FILES+=usr/libdata/perl/5.00503/UNIVERSAL.pm
 OLD_FILES+=usr/libdata/perl/5.00503/assert.pl
 OLD_FILES+=usr/libdata/perl/5.00503/autouse.pm
 OLD_FILES+=usr/libdata/perl/5.00503/base.pm
 OLD_FILES+=usr/libdata/perl/5.00503/bigfloat.pl
 OLD_FILES+=usr/libdata/perl/5.00503/bigint.pl
 OLD_FILES+=usr/libdata/perl/5.00503/bigrat.pl
 OLD_FILES+=usr/libdata/perl/5.00503/blib.pm
 OLD_FILES+=usr/libdata/perl/5.00503/cacheout.pl
 OLD_FILES+=usr/libdata/perl/5.00503/chat2.pl
 OLD_FILES+=usr/libdata/perl/5.00503/complete.pl
 OLD_FILES+=usr/libdata/perl/5.00503/constant.pm
 OLD_FILES+=usr/libdata/perl/5.00503/ctime.pl
 OLD_FILES+=usr/libdata/perl/5.00503/diagnostics.pm
 OLD_FILES+=usr/libdata/perl/5.00503/dotsh.pl
 OLD_FILES+=usr/libdata/perl/5.00503/dumpvar.pl
 OLD_FILES+=usr/libdata/perl/5.00503/exceptions.pl
 OLD_FILES+=usr/libdata/perl/5.00503/fastcwd.pl
 OLD_FILES+=usr/libdata/perl/5.00503/fields.pm
 OLD_FILES+=usr/libdata/perl/5.00503/find.pl
 OLD_FILES+=usr/libdata/perl/5.00503/finddepth.pl
 OLD_FILES+=usr/libdata/perl/5.00503/flush.pl
 OLD_FILES+=usr/libdata/perl/5.00503/ftp.pl
 OLD_FILES+=usr/libdata/perl/5.00503/getcwd.pl
 OLD_FILES+=usr/libdata/perl/5.00503/getopt.pl
 OLD_FILES+=usr/libdata/perl/5.00503/getopts.pl
 OLD_FILES+=usr/libdata/perl/5.00503/hostname.pl
 OLD_FILES+=usr/libdata/perl/5.00503/importenv.pl
 OLD_FILES+=usr/libdata/perl/5.00503/integer.pm
 OLD_FILES+=usr/libdata/perl/5.00503/less.pm
 OLD_FILES+=usr/libdata/perl/5.00503/lib.pm
 OLD_FILES+=usr/libdata/perl/5.00503/locale.pm
 OLD_FILES+=usr/libdata/perl/5.00503/look.pl
 OLD_FILES+=usr/libdata/perl/5.00503/newgetopt.pl
 OLD_FILES+=usr/libdata/perl/5.00503/open2.pl
 OLD_FILES+=usr/libdata/perl/5.00503/open3.pl
 OLD_FILES+=usr/libdata/perl/5.00503/overload.pm
 OLD_FILES+=usr/libdata/perl/5.00503/perl5db.pl
 OLD_FILES+=usr/libdata/perl/5.00503/pwd.pl
 OLD_FILES+=usr/libdata/perl/5.00503/shellwords.pl
 OLD_FILES+=usr/libdata/perl/5.00503/sigtrap.pm
 OLD_FILES+=usr/libdata/perl/5.00503/stat.pl
 OLD_FILES+=usr/libdata/perl/5.00503/strict.pm
 OLD_FILES+=usr/libdata/perl/5.00503/subs.pm
 OLD_FILES+=usr/libdata/perl/5.00503/syslog.pl
 OLD_FILES+=usr/libdata/perl/5.00503/tainted.pl
 OLD_FILES+=usr/libdata/perl/5.00503/termcap.pl
 OLD_FILES+=usr/libdata/perl/5.00503/timelocal.pl
 OLD_FILES+=usr/libdata/perl/5.00503/validate.pl
 OLD_FILES+=usr/libdata/perl/5.00503/vars.pm
 OLD_FILES+=usr/libdata/perl/5.00503/re.pm
 OLD_FILES+=usr/libdata/perl/5.00503/Config.pm
 OLD_FILES+=usr/libdata/perl/5.00503/.exists
 OLD_FILES+=usr/libdata/perl/5.00503/DynaLoader.pm
 OLD_FILES+=usr/share/perl/man/man3/AnyDBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/AutoLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/AutoSplit.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Asmdata.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Assembler.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Bblock.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Bytecode.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::C.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::CC.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Debug.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Deparse.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Disassembler.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Lint.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Showlex.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Stackobj.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Terse.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Xref.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Benchmark.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Apache.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Carp.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Cookie.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Fast.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Push.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Switch.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CPAN.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CPAN::FirstTime.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CPAN::Nox.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Carp.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Class::Struct.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Config.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Cwd.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DB_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Data::Dumper.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Devel::SelfStubber.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DirHandle.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Dumpvalue.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DynaLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/English.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Env.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Exporter.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Command.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Embed.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Install.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Installed.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Liblist.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_OS2.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_Unix.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_VMS.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_Win32.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MakeMaker.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Manifest.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Mkbootstrap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Mksymlists.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::Packlist.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::testlib.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Fatal.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Fcntl.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Basename.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::CheckTree.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Compare.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Copy.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::DosGlob.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Find.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Path.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::Mac.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::OS2.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::Unix.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::VMS.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Spec::Win32.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::stat.3.gz
 OLD_FILES+=usr/share/perl/man/man3/FileCache.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO.3.gz
 OLD_FILES+=usr/share/perl/man/man3/FileHandle.3.gz
 OLD_FILES+=usr/share/perl/man/man3/FindBin.3.gz
 OLD_FILES+=usr/share/perl/man/man3/GDBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Getopt::Long.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Getopt::Std.3.gz
 OLD_FILES+=usr/share/perl/man/man3/I18N::Collate.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Handle.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Pipe.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Seekable.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Select.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Socket.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::Msg.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::Open2.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::Open3.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::Semaphore.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IPC::SysV.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Math::BigFloat.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Math::BigInt.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Math::Complex.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Math::Trig.3.gz
 OLD_FILES+=usr/share/perl/man/man3/NDBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::Ping.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::hostent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::netent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::protoent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Net::servent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/O.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ODBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Opcode.3.gz
 OLD_FILES+=usr/share/perl/man/man3/POSIX.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Html.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Text.3.gz
 OLD_FILES+=usr/share/perl/man/man3/SDBM_File.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Safe.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Search::Dict.3.gz
 OLD_FILES+=usr/share/perl/man/man3/SelectSaver.3.gz
 OLD_FILES+=usr/share/perl/man/man3/SelfLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Shell.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Socket.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Symbol.3.gz
 OLD_FILES+=usr/share/perl/man/man3/re.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Sys::Hostname.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Sys::Syslog.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Term::Cap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Term::Complete.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Term::ReadLine.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Test.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Test::Harness.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::Abbrev.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::ParseWords.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::Soundex.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::Tabs.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Text::Wrap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread::Queue.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread::Semaphore.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread::Signal.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Thread::Specific.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::Array.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::Handle.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::Hash.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::RefHash.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::Scalar.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Tie::SubstrHash.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Time::Local.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Time::gmtime.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Time::localtime.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Time::tm.3.gz
 OLD_FILES+=usr/share/perl/man/man3/UNIVERSAL.3.gz
 OLD_FILES+=usr/share/perl/man/man3/User::grent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/User::pwent.3.gz
 OLD_FILES+=usr/share/perl/man/man3/attrs.3.gz
 OLD_FILES+=usr/share/perl/man/man3/autouse.3.gz
 OLD_FILES+=usr/share/perl/man/man3/base.3.gz
 OLD_FILES+=usr/share/perl/man/man3/blib.3.gz
 OLD_FILES+=usr/share/perl/man/man3/constant.3.gz
 OLD_FILES+=usr/share/perl/man/man3/diagnostics.3.gz
 OLD_FILES+=usr/share/perl/man/man3/fields.3.gz
 OLD_FILES+=usr/share/perl/man/man3/integer.3.gz
 OLD_FILES+=usr/share/perl/man/man3/less.3.gz
 OLD_FILES+=usr/share/perl/man/man3/lib.3.gz
 OLD_FILES+=usr/share/perl/man/man3/locale.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ops.3.gz
 OLD_FILES+=usr/share/perl/man/man3/overload.3.gz
 OLD_FILES+=usr/share/perl/man/man3/sigtrap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/strict.3.gz
 OLD_FILES+=usr/share/perl/man/man3/subs.3.gz
 OLD_FILES+=usr/share/perl/man/man3/vars.3.gz
 OLD_FILES+=usr/share/perl/man/man3/B::Stash.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ByteLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/CGI::Pretty.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Carp::Heavy.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DB.3.gz
 OLD_FILES+=usr/share/perl/man/man3/DProf::DProf.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Exporter::Heavy.3.gz
 OLD_FILES+=usr/share/perl/man/man3/ExtUtils::MM_Cygwin.3.gz
 OLD_FILES+=usr/share/perl/man/man3/File::Glob.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Glob::Glob.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Hostname::Hostname.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Dir.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Poll.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Socket::INET.3.gz
 OLD_FILES+=usr/share/perl/man/man3/IO::Socket::UNIX.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Peek::Peek.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Checker.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Find.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::InputObjects.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Man.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::ParseUtils.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Parser.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Plainer.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Select.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Text::Color.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Text::Termcap.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Pod::Usage.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Syslog::Syslog.3.gz
 OLD_FILES+=usr/share/perl/man/man3/Term::ANSIColor.3.gz
 OLD_FILES+=usr/share/perl/man/man3/XSLoader.3.gz
 OLD_FILES+=usr/share/perl/man/man3/attributes.3.gz
 OLD_FILES+=usr/share/perl/man/man3/bytes.3.gz
 OLD_FILES+=usr/share/perl/man/man3/charnames.3.gz
 OLD_FILES+=usr/share/perl/man/man3/filetest.3.gz
 OLD_FILES+=usr/share/perl/man/man3/open.3.gz
 OLD_FILES+=usr/share/perl/man/man3/utf8.3.gz
 OLD_FILES+=usr/share/perl/man/man3/warnings.3.gz
 OLD_FILES+=usr/share/perl/man/man3/warnings::register.3.gz
 OLD_FILES+=usr/share/perl/man/whatis
 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/perl.1.gz
 OLD_FILES+=usr/share/man/man1/perl5004delta.1.gz
 OLD_FILES+=usr/share/man/man1/perlapio.1.gz
 OLD_FILES+=usr/share/man/man1/perlbook.1.gz
 OLD_FILES+=usr/share/man/man1/perlbot.1.gz
 OLD_FILES+=usr/share/man/man1/perlcall.1.gz
 OLD_FILES+=usr/share/man/man1/perldata.1.gz
 OLD_FILES+=usr/share/man/man1/perldebug.1.gz
 OLD_FILES+=usr/share/man/man1/perldelta.1.gz
 OLD_FILES+=usr/share/man/man1/perldiag.1.gz
 OLD_FILES+=usr/share/man/man1/perldsc.1.gz
 OLD_FILES+=usr/share/man/man1/perlembed.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq1.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq2.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq3.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq4.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq5.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq6.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq7.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq8.1.gz
 OLD_FILES+=usr/share/man/man1/perlfaq9.1.gz
 OLD_FILES+=usr/share/man/man1/perlform.1.gz
 OLD_FILES+=usr/share/man/man1/perlfunc.1.gz
 OLD_FILES+=usr/share/man/man1/perlguts.1.gz
 OLD_FILES+=usr/share/man/man1/perlhist.1.gz
 OLD_FILES+=usr/share/man/man1/perlipc.1.gz
 OLD_FILES+=usr/share/man/man1/perllocale.1.gz
 OLD_FILES+=usr/share/man/man1/perllol.1.gz
 OLD_FILES+=usr/share/man/man1/perlmod.1.gz
 OLD_FILES+=usr/share/man/man1/perlmodinstall.1.gz
 OLD_FILES+=usr/share/man/man1/perlmodlib.1.gz
 OLD_FILES+=usr/share/man/man1/perlobj.1.gz
 OLD_FILES+=usr/share/man/man1/perlop.1.gz
 OLD_FILES+=usr/share/man/man1/perlopentut.1.gz
 OLD_FILES+=usr/share/man/man1/perlpod.1.gz
 OLD_FILES+=usr/share/man/man1/perlport.1.gz
 OLD_FILES+=usr/share/man/man1/perlre.1.gz
 OLD_FILES+=usr/share/man/man1/perlref.1.gz
 OLD_FILES+=usr/share/man/man1/perlreftut.1.gz
 OLD_FILES+=usr/share/man/man1/perlrun.1.gz
 OLD_FILES+=usr/share/man/man1/perlsec.1.gz
 OLD_FILES+=usr/share/man/man1/perlstyle.1.gz
 OLD_FILES+=usr/share/man/man1/perlsub.1.gz
 OLD_FILES+=usr/share/man/man1/perlsyn.1.gz
 OLD_FILES+=usr/share/man/man1/perlthrtut.1.gz
 OLD_FILES+=usr/share/man/man1/perltie.1.gz
 OLD_FILES+=usr/share/man/man1/perltoc.1.gz
 OLD_FILES+=usr/share/man/man1/perltoot.1.gz
 OLD_FILES+=usr/share/man/man1/perltrap.1.gz
 OLD_FILES+=usr/share/man/man1/perlvar.1.gz
 OLD_FILES+=usr/share/man/man1/perlxs.1.gz
 OLD_FILES+=usr/share/man/man1/perlxstut.1.gz
 OLD_FILES+=usr/share/man/man1/perlbug.1.gz
 OLD_FILES+=usr/share/man/man1/perlcc.1.gz
 OLD_FILES+=usr/share/man/man1/perldoc.1.gz
 OLD_FILES+=usr/share/man/man1/perl5005delta.1.gz
 OLD_FILES+=usr/share/man/man1/perlfork.1.gz
 OLD_FILES+=usr/share/man/man1/perlboot.1.gz
 OLD_FILES+=usr/share/man/man1/perltootc.1.gz
 OLD_FILES+=usr/share/man/man1/perldbmfilter.1.gz
 OLD_FILES+=usr/share/man/man1/perldebguts.1.gz
 OLD_FILES+=usr/share/man/man1/perlnumber.1.gz
 OLD_FILES+=usr/share/man/man1/perlcompile.1.gz
 OLD_FILES+=usr/share/man/man1/perltodo.1.gz
 OLD_FILES+=usr/share/man/man1/perlapi.1.gz
 OLD_FILES+=usr/share/man/man1/perlintern.1.gz
 OLD_FILES+=usr/share/man/man1/perlhack.1.gz
 OLD_FILES+=usr/share/man/man1/perlbc.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/man7/style.perl.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/man/ja/man1/perl.1.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/Africa/Timbuktu
 OLD_FILES+=usr/share/zoneinfo/Africa/Asmera
 OLD_FILES+=usr/share/zoneinfo/America/Buenos_Aires
 OLD_FILES+=usr/share/zoneinfo/America/Cordoba
 OLD_FILES+=usr/share/zoneinfo/America/Jujuy
 OLD_FILES+=usr/share/zoneinfo/America/Catamarca
 OLD_FILES+=usr/share/zoneinfo/America/Mendoza
 OLD_FILES+=usr/share/zoneinfo/America/Indianapolis
 OLD_FILES+=usr/share/zoneinfo/America/Louisville
 OLD_FILES+=usr/share/zoneinfo/America/Argentina/ComodRivadavia
 OLD_FILES+=usr/share/zoneinfo/Atlantic/Faeroe
 OLD_FILES+=usr/share/zoneinfo/Europe/Belfast
 OLD_FILES+=usr/share/zoneinfo/Pacific/Yap
 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
 
 # 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
 # 19991216
 OLD_FILES+=usr/sbin/xntpdc
 # 199909XX
 OLD_LIBS+=usr/lib/libc_r.so.3
 # ???
 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
 
 # 20131013: Removal of the ATF tools
 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
 # 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: projects/clang800-import/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
===================================================================
--- projects/clang800-import/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c	(revision 344548)
+++ projects/clang800-import/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c	(revision 344549)
@@ -1,2019 +1,2019 @@
 /*
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
  * Common Development and Distribution License (the "License").
  * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
  * See the License for the specific language governing permissions
  * and limitations under the License.
  *
  * When distributing Covered Code, include this CDDL HEADER in each
  * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  * If applicable, add the following below this CDDL HEADER, with the
  * fields enclosed by brackets "[]" replaced with your own identifying
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
  */
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 /*
  * DWARF to tdata conversion
  *
  * For the most part, conversion is straightforward, proceeding in two passes.
  * On the first pass, we iterate through every die, creating new type nodes as
  * necessary.  Referenced tdesc_t's are created in an uninitialized state, thus
  * allowing type reference pointers to be filled in.  If the tdesc_t
  * corresponding to a given die can be completely filled out (sizes and offsets
  * calculated, and so forth) without using any referenced types, the tdesc_t is
  * marked as resolved.  Consider an array type.  If the type corresponding to
  * the array contents has not yet been processed, we will create a blank tdesc
  * for the contents type (only the type ID will be filled in, relying upon the
  * later portion of the first pass to encounter and complete the referenced
  * type).  We will then attempt to determine the size of the array.  If the
  * array has a byte size attribute, we will have completely characterized the
  * array type, and will be able to mark it as resolved.  The lack of a byte
  * size attribute, on the other hand, will prevent us from fully resolving the
  * type, as the size will only be calculable with reference to the contents
  * type, which has not, as yet, been encountered.  The array type will thus be
  * left without the resolved flag, and the first pass will continue.
  *
  * When we begin the second pass, we will have created tdesc_t nodes for every
  * type in the section.  We will traverse the tree, from the iidescs down,
  * processing each unresolved node.  As the referenced nodes will have been
  * populated, the array type used in our example above will be able to use the
  * size of the referenced types (if available) to determine its own type.  The
  * traversal will be repeated until all types have been resolved or we have
  * failed to make progress.  When all tdescs have been resolved, the conversion
  * is complete.
  *
  * There are, as always, a few special cases that are handled during the first
  * and second passes:
  *
  *  1. Empty enums - GCC will occasionally emit an enum without any members.
  *     Later on in the file, it will emit the same enum type, though this time
  *     with the full complement of members.  All references to the memberless
  *     enum need to be redirected to the full definition.  During the first
  *     pass, each enum is entered in dm_enumhash, along with a pointer to its
  *     corresponding tdesc_t.  If, during the second pass, we encounter a
  *     memberless enum, we use the hash to locate the full definition.  All
  *     tdescs referencing the empty enum are then redirected.
  *
  *  2. Forward declarations - If the compiler sees a forward declaration for
  *     a structure, followed by the definition of that structure, it will emit
  *     DWARF data for both the forward declaration and the definition.  We need
  *     to resolve the forward declarations when possible, by redirecting
  *     forward-referencing tdescs to the actual struct/union definitions.  This
  *     redirection is done completely within the first pass.  We begin by
  *     recording all forward declarations in dw_fwdhash.  When we define a
  *     structure, we check to see if there have been any corresponding forward
  *     declarations.  If so, we redirect the tdescs which referenced the forward
  *     declarations to the structure or union definition.
  *
  * XXX see if a post traverser will allow the elimination of repeated pass 2
  * traversals.
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <errno.h>
 #include <libelf.h>
 #include <libdwarf.h>
 #include <libgen.h>
 #include <dwarf.h>
 
 #include "ctf_headers.h"
 #include "ctftools.h"
 #include "memory.h"
 #include "list.h"
 #include "traverse.h"
 
 /*
  * We need to define a couple of our own intrinsics, to smooth out some of the
  * differences between the GCC and DevPro DWARF emitters.  See the referenced
  * routines and the special cases in the file comment for more details.
  *
  * Type IDs are 32 bits wide.  We're going to use the top of that field to
  * indicate types that we've created ourselves.
  */
 #define	TID_FILEMAX		0x3fffffff	/* highest tid from file */
 #define	TID_VOID		0x40000001	/* see die_void() */
 #define	TID_LONG		0x40000002	/* see die_array() */
 
 #define	TID_MFGTID_BASE		0x40000003	/* first mfg'd tid */
 
 /*
  * To reduce the staggering amount of error-handling code that would otherwise
  * be required, the attribute-retrieval routines handle most of their own
  * errors.  If the following flag is supplied as the value of the `req'
  * argument, they will also handle the absence of a requested attribute by
  * terminating the program.
  */
 #define	DW_ATTR_REQ	1
 
 #define	TDESC_HASH_BUCKETS	511
 
 typedef struct dwarf {
 	Dwarf_Debug dw_dw;		/* for libdwarf */
 	Dwarf_Error dw_err;		/* for libdwarf */
 	Dwarf_Off dw_maxoff;		/* highest legal offset in this cu */
 	tdata_t *dw_td;			/* root of the tdesc/iidesc tree */
 	hash_t *dw_tidhash;		/* hash of tdescs by t_id */
 	hash_t *dw_fwdhash;		/* hash of fwd decls by name */
 	hash_t *dw_enumhash;		/* hash of memberless enums by name */
 	tdesc_t *dw_void;		/* manufactured void type */
 	tdesc_t *dw_long;		/* manufactured long type for arrays */
 	size_t dw_ptrsz;		/* size of a pointer in this file */
 	tid_t dw_mfgtid_last;		/* last mfg'd type ID used */
 	uint_t dw_nunres;		/* count of unresolved types */
 	char *dw_cuname;		/* name of compilation unit */
 } dwarf_t;
 
 static void die_create_one(dwarf_t *, Dwarf_Die);
 static void die_create(dwarf_t *, Dwarf_Die);
 
 static tid_t
 mfgtid_next(dwarf_t *dw)
 {
 	return (++dw->dw_mfgtid_last);
 }
 
 static void
 tdesc_add(dwarf_t *dw, tdesc_t *tdp)
 {
 	hash_add(dw->dw_tidhash, tdp);
 }
 
 static tdesc_t *
 tdesc_lookup(dwarf_t *dw, int tid)
 {
 	tdesc_t tmpl;
 	void *tdp;
 
 	tmpl.t_id = tid;
 
 	if (hash_find(dw->dw_tidhash, &tmpl, &tdp))
 		return (tdp);
 	else
 		return (NULL);
 }
 
 /*
  * Resolve a tdesc down to a node which should have a size.  Returns the size,
  * zero if the size hasn't yet been determined.
  */
 static size_t
 tdesc_size(tdesc_t *tdp)
 {
 	for (;;) {
 		switch (tdp->t_type) {
 		case INTRINSIC:
 		case POINTER:
 		case ARRAY:
 		case FUNCTION:
 		case STRUCT:
 		case UNION:
 		case ENUM:
 			return (tdp->t_size);
 
 		case FORWARD:
 			return (0);
 
 		case TYPEDEF:
 		case VOLATILE:
 		case CONST:
 		case RESTRICT:
 			tdp = tdp->t_tdesc;
 			continue;
 
 		case 0: /* not yet defined */
 			return (0);
 
 		default:
 			terminate("tdp %u: tdesc_size on unknown type %d\n",
 			    tdp->t_id, tdp->t_type);
 		}
 	}
 }
 
 static size_t
 tdesc_bitsize(tdesc_t *tdp)
 {
 	for (;;) {
 		switch (tdp->t_type) {
 		case INTRINSIC:
 			return (tdp->t_intr->intr_nbits);
 
 		case ARRAY:
 		case FUNCTION:
 		case STRUCT:
 		case UNION:
 		case ENUM:
 		case POINTER:
 			return (tdp->t_size * NBBY);
 
 		case FORWARD:
 			return (0);
 
 		case TYPEDEF:
 		case VOLATILE:
 		case RESTRICT:
 		case CONST:
 			tdp = tdp->t_tdesc;
 			continue;
 
 		case 0: /* not yet defined */
 			return (0);
 
 		default:
 			terminate("tdp %u: tdesc_bitsize on unknown type %d\n",
 			    tdp->t_id, tdp->t_type);
 		}
 	}
 }
 
 static tdesc_t *
 tdesc_basetype(tdesc_t *tdp)
 {
 	for (;;) {
 		switch (tdp->t_type) {
 		case TYPEDEF:
 		case VOLATILE:
 		case RESTRICT:
 		case CONST:
 			tdp = tdp->t_tdesc;
 			break;
 		case 0: /* not yet defined */
 			return (NULL);
 		default:
 			return (tdp);
 		}
 	}
 }
 
 static Dwarf_Off
 die_off(dwarf_t *dw, Dwarf_Die die)
 {
 	Dwarf_Off off;
 
 	if (dwarf_dieoffset(die, &off, &dw->dw_err) == DW_DLV_OK)
 		return (off);
 
 	terminate("failed to get offset for die: %s\n",
 	    dwarf_errmsg(dw->dw_err));
 	/*NOTREACHED*/
 	return (0);
 }
 
 static Dwarf_Die
 die_sibling(dwarf_t *dw, Dwarf_Die die)
 {
 	Dwarf_Die sib;
 	int rc;
 
 	if ((rc = dwarf_siblingof(dw->dw_dw, die, &sib, &dw->dw_err)) ==
 	    DW_DLV_OK)
 		return (sib);
 	else if (rc == DW_DLV_NO_ENTRY)
 		return (NULL);
 
 	terminate("die %llu: failed to find type sibling: %s\n",
 	    die_off(dw, die), dwarf_errmsg(dw->dw_err));
 	/*NOTREACHED*/
 	return (NULL);
 }
 
 static Dwarf_Die
 die_child(dwarf_t *dw, Dwarf_Die die)
 {
 	Dwarf_Die child;
 	int rc;
 
 	if ((rc = dwarf_child(die, &child, &dw->dw_err)) == DW_DLV_OK)
 		return (child);
 	else if (rc == DW_DLV_NO_ENTRY)
 		return (NULL);
 
 	terminate("die %llu: failed to find type child: %s\n",
 	    die_off(dw, die), dwarf_errmsg(dw->dw_err));
 	/*NOTREACHED*/
 	return (NULL);
 }
 
 static Dwarf_Half
 die_tag(dwarf_t *dw, Dwarf_Die die)
 {
 	Dwarf_Half tag;
 
 	if (dwarf_tag(die, &tag, &dw->dw_err) == DW_DLV_OK)
 		return (tag);
 
 	terminate("die %llu: failed to get tag for type: %s\n",
 	    die_off(dw, die), dwarf_errmsg(dw->dw_err));
 	/*NOTREACHED*/
 	return (0);
 }
 
 static Dwarf_Attribute
 die_attr(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, int req)
 {
 	Dwarf_Attribute attr;
 	int rc;
 
 	if ((rc = dwarf_attr(die, name, &attr, &dw->dw_err)) == DW_DLV_OK) {
 		return (attr);
 	} else if (rc == DW_DLV_NO_ENTRY) {
 		if (req) {
 			terminate("die %llu: no attr 0x%x\n", die_off(dw, die),
 			    name);
 		} else {
 			return (NULL);
 		}
 	}
 
 	terminate("die %llu: failed to get attribute for type: %s\n",
 	    die_off(dw, die), dwarf_errmsg(dw->dw_err));
 	/*NOTREACHED*/
 	return (NULL);
 }
 
 static int
 die_signed(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, Dwarf_Signed *valp,
     int req)
 {
 	*valp = 0;
 	if (dwarf_attrval_signed(die, name, valp, &dw->dw_err) != DW_DLV_OK) {
 		if (req) 
 			terminate("die %llu: failed to get signed: %s\n",
 			    die_off(dw, die), dwarf_errmsg(dw->dw_err));
 		return (0);
 	}
 
 	return (1);
 }
 
 static int
 die_unsigned(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, Dwarf_Unsigned *valp,
     int req)
 {
 	*valp = 0;
 	if (dwarf_attrval_unsigned(die, name, valp, &dw->dw_err) != DW_DLV_OK) {
 		if (req) 
 			terminate("die %llu: failed to get unsigned: %s\n",
 			    die_off(dw, die), dwarf_errmsg(dw->dw_err));
 		return (0);
 	}
 
 	return (1);
 }
 
 static int
 die_bool(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, Dwarf_Bool *valp, int req)
 {
 	*valp = 0;
 
 	if (dwarf_attrval_flag(die, name, valp, &dw->dw_err) != DW_DLV_OK) {
 		if (req) 
 			terminate("die %llu: failed to get flag: %s\n",
 			    die_off(dw, die), dwarf_errmsg(dw->dw_err));
 		return (0);
 	}
 
 	return (1);
 }
 
 static int
 die_string(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name, char **strp, int req)
 {
 	const char *str = NULL;
 
 	if (dwarf_attrval_string(die, name, &str, &dw->dw_err) != DW_DLV_OK ||
 	    str == NULL) {
 		if (req) 
 			terminate("die %llu: failed to get string: %s\n",
 			    die_off(dw, die), dwarf_errmsg(dw->dw_err));
 		else
 			*strp = NULL;
 		return (0);
 	} else
 		*strp = xstrdup(str);
 
 	return (1);
 }
 
 static Dwarf_Off
 die_attr_ref(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name)
 {
 	Dwarf_Off off;
 
 	if (dwarf_attrval_unsigned(die, name, &off, &dw->dw_err) != DW_DLV_OK) {
 		terminate("die %llu: failed to get ref: %s\n",
 		    die_off(dw, die), dwarf_errmsg(dw->dw_err));
 	}
 
 	return (off);
 }
 
 static char *
 die_name(dwarf_t *dw, Dwarf_Die die)
 {
 	char *str = NULL;
 
 	(void) die_string(dw, die, DW_AT_name, &str, 0);
 	if (str == NULL)
 		str = xstrdup("");
 
 	return (str);
 }
 
 static int
 die_isdecl(dwarf_t *dw, Dwarf_Die die)
 {
 	Dwarf_Bool val;
 
 	return (die_bool(dw, die, DW_AT_declaration, &val, 0) && val);
 }
 
 static int
 die_isglobal(dwarf_t *dw, Dwarf_Die die)
 {
 	Dwarf_Signed vis;
 	Dwarf_Bool ext;
 
 	/*
 	 * Some compilers (gcc) use DW_AT_external to indicate function
 	 * visibility.  Others (Sun) use DW_AT_visibility.
 	 */
 	if (die_signed(dw, die, DW_AT_visibility, &vis, 0))
 		return (vis == DW_VIS_exported);
 	else
 		return (die_bool(dw, die, DW_AT_external, &ext, 0) && ext);
 }
 
 static tdesc_t *
 die_add(dwarf_t *dw, Dwarf_Off off)
 {
 	tdesc_t *tdp = xcalloc(sizeof (tdesc_t));
 
 	tdp->t_id = off;
 
 	tdesc_add(dw, tdp);
 
 	return (tdp);
 }
 
 static tdesc_t *
 die_lookup_pass1(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name)
 {
 	Dwarf_Off ref = die_attr_ref(dw, die, name);
 	tdesc_t *tdp;
 
 	if ((tdp = tdesc_lookup(dw, ref)) != NULL)
 		return (tdp);
 
 	return (die_add(dw, ref));
 }
 
 static int
 die_mem_offset(dwarf_t *dw, Dwarf_Die die, Dwarf_Half name,
     Dwarf_Unsigned *valp, int req __unused)
 {
 	Dwarf_Locdesc *loc = NULL;
 	Dwarf_Signed locnum = 0;
 	Dwarf_Attribute at;
 	Dwarf_Half form;
 
 	if (name != DW_AT_data_member_location)
 		terminate("die %llu: can only process attribute "
 		    "DW_AT_data_member_location\n", die_off(dw, die));
 
 	if ((at = die_attr(dw, die, name, 0)) == NULL)
 		return (0);
 
 	if (dwarf_whatform(at, &form, &dw->dw_err) != DW_DLV_OK)
 		return (0);
 
 	switch (form) {
 	case DW_FORM_sec_offset:
 	case DW_FORM_block:
 	case DW_FORM_block1:
 	case DW_FORM_block2:
 	case DW_FORM_block4:
 		/*
 		 * GCC in base and Clang (3.3 or below) generates
 		 * DW_AT_data_member_location attribute with DW_FORM_block*
 		 * form. The attribute contains one DW_OP_plus_uconst
 		 * operator. The member offset stores in the operand.
 		 */
 		if (dwarf_loclist(at, &loc, &locnum, &dw->dw_err) != DW_DLV_OK)
 			return (0);
 		if (locnum != 1 || loc->ld_s->lr_atom != DW_OP_plus_uconst) {
 			terminate("die %llu: cannot parse member offset with "
 			    "operator other than DW_OP_plus_uconst\n",
 			    die_off(dw, die));
 		}
 		*valp = loc->ld_s->lr_number;
 		if (loc != NULL) {
 			dwarf_dealloc(dw->dw_dw, loc->ld_s, DW_DLA_LOC_BLOCK);
 			dwarf_dealloc(dw->dw_dw, loc, DW_DLA_LOCDESC);
 		}
 		break;
 
 	case DW_FORM_data1:
 	case DW_FORM_data2:
 	case DW_FORM_data4:
 	case DW_FORM_data8:
 	case DW_FORM_udata:
 		/*
 		 * Clang 3.4 generates DW_AT_data_member_location attribute
 		 * with DW_FORM_data* form (constant class). The attribute
 		 * stores a contant value which is the member offset.
 		 *
 		 * However, note that DW_FORM_data[48] in DWARF version 2 or 3
 		 * could be used as a section offset (offset into .debug_loc in
 		 * this case). Here we assume the attribute always stores a
 		 * constant because we know Clang 3.4 does this and GCC in
 		 * base won't emit DW_FORM_data[48] for this attribute. This
 		 * code will remain correct if future vesrions of Clang and
 		 * GCC conform to DWARF4 standard and only use the form
 		 * DW_FORM_sec_offset for section offset.
 		 */
 		if (dwarf_attrval_unsigned(die, name, valp, &dw->dw_err) !=
 		    DW_DLV_OK)
 			return (0);
 		break;
 
 	default:
 		terminate("die %llu: cannot parse member offset with form "
 		    "%u\n", die_off(dw, die), form);
 	}
 
 	return (1);
 }
 
 static tdesc_t *
 tdesc_intr_common(dwarf_t *dw, int tid, const char *name, size_t sz)
 {
 	tdesc_t *tdp;
 	intr_t *intr;
 
 	intr = xcalloc(sizeof (intr_t));
 	intr->intr_type = INTR_INT;
 	intr->intr_signed = 1;
 	intr->intr_nbits = sz * NBBY;
 
 	tdp = xcalloc(sizeof (tdesc_t));
 	tdp->t_name = xstrdup(name);
 	tdp->t_size = sz;
 	tdp->t_id = tid;
 	tdp->t_type = INTRINSIC;
 	tdp->t_intr = intr;
 	tdp->t_flags = TDESC_F_RESOLVED;
 
 	tdesc_add(dw, tdp);
 
 	return (tdp);
 }
 
 /*
  * Manufacture a void type.  Used for gcc-emitted stabs, where the lack of a
  * type reference implies a reference to a void type.  A void *, for example
  * will be represented by a pointer die without a DW_AT_type.  CTF requires
  * that pointer nodes point to something, so we'll create a void for use as
  * the target.  Note that the DWARF data may already create a void type.  Ours
  * would then be a duplicate, but it'll be removed in the self-uniquification
  * merge performed at the completion of DWARF->tdesc conversion.
  */
 static tdesc_t *
 tdesc_intr_void(dwarf_t *dw)
 {
 	if (dw->dw_void == NULL)
 		dw->dw_void = tdesc_intr_common(dw, TID_VOID, "void", 0);
 
 	return (dw->dw_void);
 }
 
 static tdesc_t *
 tdesc_intr_long(dwarf_t *dw)
 {
 	if (dw->dw_long == NULL) {
 		dw->dw_long = tdesc_intr_common(dw, TID_LONG, "long",
 		    dw->dw_ptrsz);
 	}
 
 	return (dw->dw_long);
 }
 
 /*
  * Used for creating bitfield types.  We create a copy of an existing intrinsic,
  * adjusting the size of the copy to match what the caller requested.  The
  * caller can then use the copy as the type for a bitfield structure member.
  */
 static tdesc_t *
 tdesc_intr_clone(dwarf_t *dw, tdesc_t *old, size_t bitsz)
 {
 	tdesc_t *new = xcalloc(sizeof (tdesc_t));
 
 	if (!(old->t_flags & TDESC_F_RESOLVED)) {
 		terminate("tdp %u: attempt to make a bit field from an "
 		    "unresolved type\n", old->t_id);
 	}
 
 	new->t_name = xstrdup(old->t_name);
 	new->t_size = old->t_size;
 	new->t_id = mfgtid_next(dw);
 	new->t_type = INTRINSIC;
 	new->t_flags = TDESC_F_RESOLVED;
 
 	new->t_intr = xcalloc(sizeof (intr_t));
 	bcopy(old->t_intr, new->t_intr, sizeof (intr_t));
 	new->t_intr->intr_nbits = bitsz;
 
 	tdesc_add(dw, new);
 
 	return (new);
 }
 
 static void
 tdesc_array_create(dwarf_t *dw, Dwarf_Die dim, tdesc_t *arrtdp,
     tdesc_t *dimtdp)
 {
 	Dwarf_Unsigned uval;
 	Dwarf_Signed sval;
 	tdesc_t *ctdp = NULL;
 	Dwarf_Die dim2;
 	ardef_t *ar;
 
 	if ((dim2 = die_sibling(dw, dim)) == NULL) {
 		ctdp = arrtdp;
 	} else if (die_tag(dw, dim2) == DW_TAG_subrange_type) {
 		ctdp = xcalloc(sizeof (tdesc_t));
 		ctdp->t_id = mfgtid_next(dw);
 		debug(3, "die %llu: creating new type %u for sub-dimension\n",
 		    die_off(dw, dim2), ctdp->t_id);
 		tdesc_array_create(dw, dim2, arrtdp, ctdp);
 	} else {
 		terminate("die %llu: unexpected non-subrange node in array\n",
 		    die_off(dw, dim2));
 	}
 
 	dimtdp->t_type = ARRAY;
 	dimtdp->t_ardef = ar = xcalloc(sizeof (ardef_t));
 
 	/*
 	 * Array bounds can be signed or unsigned, but there are several kinds
 	 * of signless forms (data1, data2, etc) that take their sign from the
 	 * routine that is trying to interpret them.  That is, data1 can be
 	 * either signed or unsigned, depending on whether you use the signed or
 	 * unsigned accessor function.  GCC will use the signless forms to store
 	 * unsigned values which have their high bit set, so we need to try to
 	 * read them first as unsigned to get positive values.  We could also
 	 * try signed first, falling back to unsigned if we got a negative
 	 * value.
 	 */
 	if (die_unsigned(dw, dim, DW_AT_upper_bound, &uval, 0))
 		ar->ad_nelems = uval + 1;
 	else if (die_signed(dw, dim, DW_AT_upper_bound, &sval, 0))
 		ar->ad_nelems = sval + 1;
 	else if (die_unsigned(dw, dim, DW_AT_count, &uval, 0))
 		ar->ad_nelems = uval;
 	else if (die_signed(dw, dim, DW_AT_count, &sval, 0))
 		ar->ad_nelems = sval;
 	else
 		ar->ad_nelems = 0;
 
 	/*
 	 * Different compilers use different index types.  Force the type to be
 	 * a common, known value (long).
 	 */
 	ar->ad_idxtype = tdesc_intr_long(dw);
 	ar->ad_contents = ctdp;
 
 	if (ar->ad_contents->t_size != 0) {
 		dimtdp->t_size = ar->ad_contents->t_size * ar->ad_nelems;
 		dimtdp->t_flags |= TDESC_F_RESOLVED;
 	}
 }
 
 /*
  * Create a tdesc from an array node.  Some arrays will come with byte size
  * attributes, and thus can be resolved immediately.  Others don't, and will
  * need to wait until the second pass for resolution.
  */
 static void
 die_array_create(dwarf_t *dw, Dwarf_Die arr, Dwarf_Off off, tdesc_t *tdp)
 {
 	tdesc_t *arrtdp = die_lookup_pass1(dw, arr, DW_AT_type);
 	Dwarf_Unsigned uval;
 	Dwarf_Die dim;
 
 	debug(3, "die %llu <%llx>: creating array\n", off, off);
 
 	if ((dim = die_child(dw, arr)) == NULL ||
 	    die_tag(dw, dim) != DW_TAG_subrange_type)
 		terminate("die %llu: failed to retrieve array bounds\n", off);
 
 	tdesc_array_create(dw, dim, arrtdp, tdp);
 
 	if (die_unsigned(dw, arr, DW_AT_byte_size, &uval, 0)) {
 		tdesc_t *dimtdp;
 		int flags;
 
 		tdp->t_size = uval;
 
 		/*
 		 * Ensure that sub-dimensions have sizes too before marking
 		 * as resolved.
 		 */
 		flags = TDESC_F_RESOLVED;
 		for (dimtdp = tdp->t_ardef->ad_contents;
 		    dimtdp->t_type == ARRAY;
 		    dimtdp = dimtdp->t_ardef->ad_contents) {
 			if (!(dimtdp->t_flags & TDESC_F_RESOLVED)) {
 				flags = 0;
 				break;
 			}
 		}
 
 		tdp->t_flags |= flags;
 	}
 
 	debug(3, "die %llu <%llx>: array nelems %u size %u\n", off, off,
 	    tdp->t_ardef->ad_nelems, tdp->t_size);
 }
 
 /*ARGSUSED1*/
 static int
 die_array_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private)
 {
 	dwarf_t *dw = private;
 	size_t sz;
 
 	if (tdp->t_flags & TDESC_F_RESOLVED)
 		return (1);
 
 	debug(3, "trying to resolve array %d (cont %d)\n", tdp->t_id,
 	    tdp->t_ardef->ad_contents->t_id);
 
 	if ((sz = tdesc_size(tdp->t_ardef->ad_contents)) == 0 &&
 	    (tdp->t_ardef->ad_contents->t_flags & TDESC_F_RESOLVED) == 0) {
 		debug(3, "unable to resolve array %s (%d) contents %d\n",
 		    tdesc_name(tdp), tdp->t_id,
 		    tdp->t_ardef->ad_contents->t_id);
 
 		dw->dw_nunres++;
 		return (1);
 	}
 
 	tdp->t_size = sz * tdp->t_ardef->ad_nelems;
 	tdp->t_flags |= TDESC_F_RESOLVED;
 
 	debug(3, "resolved array %d: %u bytes\n", tdp->t_id, tdp->t_size);
 
 	return (1);
 }
 
 /*ARGSUSED1*/
 static int
 die_array_failed(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private __unused)
 {
 	tdesc_t *cont = tdp->t_ardef->ad_contents;
 
 	if (tdp->t_flags & TDESC_F_RESOLVED)
 		return (1);
 
 	fprintf(stderr, "Array %d: failed to size contents type %s (%d)\n",
 	    tdp->t_id, tdesc_name(cont), cont->t_id);
 
 	return (1);
 }
 
 /*
  * Most enums (those with members) will be resolved during this first pass.
  * Others - those without members (see the file comment) - won't be, and will
  * need to wait until the second pass when they can be matched with their full
  * definitions.
  */
 static void
 die_enum_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
 {
 	Dwarf_Die mem;
 	Dwarf_Unsigned uval;
 	Dwarf_Signed sval;
 
 	if (die_isdecl(dw, die)) {
 		tdp->t_type = FORWARD;
 		return;
 	}
 
 	debug(3, "die %llu: creating enum\n", off);
 
 	tdp->t_type = ENUM;
 
 	(void) die_unsigned(dw, die, DW_AT_byte_size, &uval, DW_ATTR_REQ);
 	tdp->t_size = uval;
 
 	if ((mem = die_child(dw, die)) != NULL) {
 		elist_t **elastp = &tdp->t_emem;
 
 		do {
 			elist_t *el;
 
 			if (die_tag(dw, mem) != DW_TAG_enumerator) {
 				/* Nested type declaration */
 				die_create_one(dw, mem);
 				continue;
 			}
 
 			el = xcalloc(sizeof (elist_t));
 			el->el_name = die_name(dw, mem);
 
 			if (die_signed(dw, mem, DW_AT_const_value, &sval, 0)) {
 				el->el_number = sval;
 			} else if (die_unsigned(dw, mem, DW_AT_const_value,
 			    &uval, 0)) {
 				el->el_number = uval;
 			} else {
 				terminate("die %llu: enum %llu: member without "
 				    "value\n", off, die_off(dw, mem));
 			}
 
 			debug(3, "die %llu: enum %llu: created %s = %d\n", off,
 			    die_off(dw, mem), el->el_name, el->el_number);
 
 			*elastp = el;
 			elastp = &el->el_next;
 
 		} while ((mem = die_sibling(dw, mem)) != NULL);
 
 		hash_add(dw->dw_enumhash, tdp);
 
 		tdp->t_flags |= TDESC_F_RESOLVED;
 
 		if (tdp->t_name != NULL) {
 			iidesc_t *ii = xcalloc(sizeof (iidesc_t));
 			ii->ii_type = II_SOU;
 			ii->ii_name = xstrdup(tdp->t_name);
 			ii->ii_dtype = tdp;
 
 			iidesc_add(dw->dw_td->td_iihash, ii);
 		}
 	}
 }
 
 static int
 die_enum_match(void *arg1, void *arg2)
 {
 	tdesc_t *tdp = arg1, **fullp = arg2;
 
 	if (tdp->t_emem != NULL) {
 		*fullp = tdp;
 		return (-1); /* stop the iteration */
 	}
 
 	return (0);
 }
 
 /*ARGSUSED1*/
 static int
 die_enum_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private)
 {
 	dwarf_t *dw = private;
 	tdesc_t *full = NULL;
 
 	if (tdp->t_flags & TDESC_F_RESOLVED)
 		return (1);
 
 	(void) hash_find_iter(dw->dw_enumhash, tdp, die_enum_match, &full);
 
 	/*
 	 * The answer to this one won't change from iteration to iteration,
 	 * so don't even try.
 	 */
 	if (full == NULL) {
 		terminate("tdp %u: enum %s has no members\n", tdp->t_id,
 		    tdesc_name(tdp));
 	}
 
 	debug(3, "tdp %u: enum %s redirected to %u\n", tdp->t_id,
 	    tdesc_name(tdp), full->t_id);
 
 	tdp->t_flags |= TDESC_F_RESOLVED;
 
 	return (1);
 }
 
 static int
 die_fwd_map(void *arg1, void *arg2)
 {
 	tdesc_t *fwd = arg1, *sou = arg2;
 
 	debug(3, "tdp %u: mapped forward %s to sou %u\n", fwd->t_id,
 	    tdesc_name(fwd), sou->t_id);
 	fwd->t_tdesc = sou;
 
 	return (0);
 }
 
 /*
  * Structures and unions will never be resolved during the first pass, as we
  * won't be able to fully determine the member sizes.  The second pass, which
  * have access to sizing information, will be able to complete the resolution.
  */
 static void
 die_sou_create(dwarf_t *dw, Dwarf_Die str, Dwarf_Off off, tdesc_t *tdp,
     int type, const char *typename)
 {
 	Dwarf_Unsigned sz, bitsz, bitoff;
 #if BYTE_ORDER == _LITTLE_ENDIAN
 	Dwarf_Unsigned bysz;
 #endif
 	Dwarf_Die mem;
 	mlist_t *ml, **mlastp;
 	iidesc_t *ii;
 
 	tdp->t_type = (die_isdecl(dw, str) ? FORWARD : type);
 
 	debug(3, "die %llu: creating %s %s\n", off,
 	    (tdp->t_type == FORWARD ? "forward decl" : typename),
 	    tdesc_name(tdp));
 
 	if (tdp->t_type == FORWARD) {
 		hash_add(dw->dw_fwdhash, tdp);
 		return;
 	}
 
 	(void) hash_find_iter(dw->dw_fwdhash, tdp, die_fwd_map, tdp);
 
 	(void) die_unsigned(dw, str, DW_AT_byte_size, &sz, DW_ATTR_REQ);
 	tdp->t_size = sz;
 
 	/*
 	 * GCC allows empty SOUs as an extension.
 	 */
 	if ((mem = die_child(dw, str)) == NULL) {
 		goto out;
 	}
 
 	mlastp = &tdp->t_members;
 
 	do {
 		Dwarf_Off memoff = die_off(dw, mem);
 		Dwarf_Half tag = die_tag(dw, mem);
 		Dwarf_Unsigned mloff;
 
 		if (tag != DW_TAG_member) {
 			/* Nested type declaration */
 			die_create_one(dw, mem);
 			continue;
 		}
 
 		debug(3, "die %llu: mem %llu: creating member\n", off, memoff);
 
 		ml = xcalloc(sizeof (mlist_t));
 
 		/*
 		 * This could be a GCC anon struct/union member, so we'll allow
 		 * an empty name, even though nothing can really handle them
 		 * properly.  Note that some versions of GCC miss out debug
 		 * info for anon structs, though recent versions are fixed (gcc
 		 * bug 11816).
 		 */
 		if ((ml->ml_name = die_name(dw, mem)) == NULL)
 			ml->ml_name = NULL;
 
 		ml->ml_type = die_lookup_pass1(dw, mem, DW_AT_type);
 
 		if (die_mem_offset(dw, mem, DW_AT_data_member_location,
 		    &mloff, 0)) {
 			debug(3, "die %llu: got mloff %llx\n", off,
 			    (u_longlong_t)mloff);
 			ml->ml_offset = mloff * 8;
 		}
 
 		if (die_unsigned(dw, mem, DW_AT_bit_size, &bitsz, 0))
 			ml->ml_size = bitsz;
 		else
 			ml->ml_size = tdesc_bitsize(ml->ml_type);
 
 		if (die_unsigned(dw, mem, DW_AT_bit_offset, &bitoff, 0)) {
 #if BYTE_ORDER == _BIG_ENDIAN
 			ml->ml_offset += bitoff;
 #else
 			/*
 			 * Note that Clang 3.4 will sometimes generate
 			 * member DIE before generating the DIE for the
 			 * member's type. The code can not handle this
 			 * properly so that tdesc_bitsize(ml->ml_type) will
 			 * return 0 because ml->ml_type is unknown. As a
 			 * result, a wrong member offset will be calculated.
 			 * To workaround this, we can instead try to
 			 * retrieve the value of DW_AT_byte_size attribute
 			 * which stores the byte size of the space occupied
 			 * by the type. If this attribute exists, its value
 			 * should equal to tdesc_bitsize(ml->ml_type)/NBBY.
 			 */
 			if (die_unsigned(dw, mem, DW_AT_byte_size, &bysz, 0) &&
 			    bysz > 0)
 				ml->ml_offset += bysz * NBBY - bitoff -
 				    ml->ml_size;
 			else
 				ml->ml_offset += tdesc_bitsize(ml->ml_type) -
 				    bitoff - ml->ml_size;
 #endif
 		}
 
 		debug(3, "die %llu: mem %llu: created \"%s\" (off %u sz %u)\n",
 		    off, memoff, ml->ml_name, ml->ml_offset, ml->ml_size);
 
 		*mlastp = ml;
 		mlastp = &ml->ml_next;
 	} while ((mem = die_sibling(dw, mem)) != NULL);
 
 	/*
 	 * GCC will attempt to eliminate unused types, thus decreasing the
 	 * size of the emitted dwarf.  That is, if you declare a foo_t in your
 	 * header, include said header in your source file, and neglect to
 	 * actually use (directly or indirectly) the foo_t in the source file,
 	 * the foo_t won't make it into the emitted DWARF.  So, at least, goes
 	 * the theory.
 	 *
 	 * Occasionally, it'll emit the DW_TAG_structure_type for the foo_t,
 	 * and then neglect to emit the members.  Strangely, the loner struct
 	 * tag will always be followed by a proper nested declaration of
 	 * something else.  This is clearly a bug, but we're not going to have
 	 * time to get it fixed before this goo goes back, so we'll have to work
 	 * around it.  If we see a no-membered struct with a nested declaration
 	 * (i.e. die_child of the struct tag won't be null), we'll ignore it.
 	 * Being paranoid, we won't simply remove it from the hash.  Instead,
 	 * we'll decline to create an iidesc for it, thus ensuring that this
 	 * type won't make it into the output file.  To be safe, we'll also
 	 * change the name.
 	 */
 	if (tdp->t_members == NULL) {
 		const char *old = tdesc_name(tdp);
 		size_t newsz = 7 + strlen(old) + 1;
 		char *new = xmalloc(newsz);
 		(void) snprintf(new, newsz, "orphan %s", old);
 
 		debug(3, "die %llu: worked around %s %s\n", off, typename, old);
 
 		if (tdp->t_name != NULL)
 			free(tdp->t_name);
 		tdp->t_name = new;
 		return;
 	}
 
 out:
 	if (tdp->t_name != NULL) {
 		ii = xcalloc(sizeof (iidesc_t));
 		ii->ii_type = II_SOU;
 		ii->ii_name = xstrdup(tdp->t_name);
 		ii->ii_dtype = tdp;
 
 		iidesc_add(dw->dw_td->td_iihash, ii);
 	}
 }
 
 static void
 die_struct_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
 {
 	die_sou_create(dw, die, off, tdp, STRUCT, "struct");
 }
 
 static void
 die_union_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
 {
 	die_sou_create(dw, die, off, tdp, UNION, "union");
 }
 
 /*ARGSUSED1*/
 static int
 die_sou_resolve(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private)
 {
 	dwarf_t *dw = private;
 	mlist_t *ml;
 	tdesc_t *mt;
 
 	if (tdp->t_flags & TDESC_F_RESOLVED)
 		return (1);
 
 	debug(3, "resolving sou %s\n", tdesc_name(tdp));
 
 	for (ml = tdp->t_members; ml != NULL; ml = ml->ml_next) {
 		if (ml->ml_size == 0) {
 			mt = tdesc_basetype(ml->ml_type);
 
 			if ((ml->ml_size = tdesc_bitsize(mt)) != 0)
 				continue;
 
 			/*
 			 * For empty members, or GCC/C99 flexible array
 			 * members, a size of 0 is correct. Structs and unions
 			 * consisting of flexible array members will also have
 			 * size 0.
 			 */
 			if (mt->t_members == NULL)
 				continue;
 			if (mt->t_type == ARRAY && mt->t_ardef->ad_nelems == 0)
 				continue;
 			if ((mt->t_flags & TDESC_F_RESOLVED) != 0 &&
 			    (mt->t_type == STRUCT || mt->t_type == UNION))
 				continue;
 
 			dw->dw_nunres++;
 			return (1);
 		}
 
 		if ((mt = tdesc_basetype(ml->ml_type)) == NULL) {
 			dw->dw_nunres++;
 			return (1);
 		}
 
 		if (ml->ml_size != 0 && mt->t_type == INTRINSIC &&
 		    mt->t_intr->intr_nbits != ml->ml_size) {
 			/*
 			 * This member is a bitfield, and needs to reference
 			 * an intrinsic type with the same width.  If the
 			 * currently-referenced type isn't of the same width,
 			 * we'll copy it, adjusting the width of the copy to
 			 * the size we'd like.
 			 */
 			debug(3, "tdp %u: creating bitfield for %d bits\n",
 			    tdp->t_id, ml->ml_size);
 
 			ml->ml_type = tdesc_intr_clone(dw, mt, ml->ml_size);
 		}
 	}
 
 	tdp->t_flags |= TDESC_F_RESOLVED;
 
 	return (1);
 }
 
 /*ARGSUSED1*/
 static int
 die_sou_failed(tdesc_t *tdp, tdesc_t **tdpp __unused, void *private __unused)
 {
 	const char *typename = (tdp->t_type == STRUCT ? "struct" : "union");
 	mlist_t *ml;
 
 	if (tdp->t_flags & TDESC_F_RESOLVED)
 		return (1);
 
 	for (ml = tdp->t_members; ml != NULL; ml = ml->ml_next) {
 		if (ml->ml_size == 0) {
 			fprintf(stderr, "%s %d <%x>: failed to size member \"%s\" "
 			    "of type %s (%d <%x>)\n", typename, tdp->t_id,
 			    tdp->t_id,
 			    ml->ml_name, tdesc_name(ml->ml_type),
 			    ml->ml_type->t_id, ml->ml_type->t_id);
 		}
 	}
 
 	return (1);
 }
 
 static void
 die_funcptr_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
 {
 	Dwarf_Attribute attr;
 	Dwarf_Half tag;
 	Dwarf_Die arg;
 	fndef_t *fn;
 	int i;
 
 	debug(3, "die %llu <%llx>: creating function pointer\n", off, off);
 
 	/*
 	 * We'll begin by processing any type definition nodes that may be
 	 * lurking underneath this one.
 	 */
 	for (arg = die_child(dw, die); arg != NULL;
 	    arg = die_sibling(dw, arg)) {
 		if ((tag = die_tag(dw, arg)) != DW_TAG_formal_parameter &&
 		    tag != DW_TAG_unspecified_parameters) {
 			/* Nested type declaration */
 			die_create_one(dw, arg);
 		}
 	}
 
 	if (die_isdecl(dw, die)) {
 		/*
 		 * This is a prototype.  We don't add prototypes to the
 		 * tree, so we're going to drop the tdesc.  Unfortunately,
 		 * it has already been added to the tree.  Nobody will reference
 		 * it, though, and it will be leaked.
 		 */
 		return;
 	}
 
 	fn = xcalloc(sizeof (fndef_t));
 
 	tdp->t_type = FUNCTION;
 
 	if ((attr = die_attr(dw, die, DW_AT_type, 0)) != NULL) {
 		fn->fn_ret = die_lookup_pass1(dw, die, DW_AT_type);
 	} else {
 		fn->fn_ret = tdesc_intr_void(dw);
 	}
 
 	/*
 	 * Count the arguments to the function, then read them in.
 	 */
 	for (fn->fn_nargs = 0, arg = die_child(dw, die); arg != NULL;
 	    arg = die_sibling(dw, arg)) {
 		if ((tag = die_tag(dw, arg)) == DW_TAG_formal_parameter)
 			fn->fn_nargs++;
 		else if (tag == DW_TAG_unspecified_parameters &&
 		    fn->fn_nargs > 0)
 			fn->fn_vargs = 1;
 	}
 
 	if (fn->fn_nargs != 0) {
 		debug(3, "die %llu: adding %d argument%s\n", off, fn->fn_nargs,
 		    (fn->fn_nargs > 1 ? "s" : ""));
 
 		fn->fn_args = xcalloc(sizeof (tdesc_t *) * fn->fn_nargs);
 		for (i = 0, arg = die_child(dw, die);
 		    arg != NULL && i < (int) fn->fn_nargs;
 		    arg = die_sibling(dw, arg)) {
 			if (die_tag(dw, arg) != DW_TAG_formal_parameter)
 				continue;
 
 			fn->fn_args[i++] = die_lookup_pass1(dw, arg,
 			    DW_AT_type);
 		}
 	}
 
 	tdp->t_fndef = fn;
 	tdp->t_flags |= TDESC_F_RESOLVED;
 }
 
 /*
  * GCC and DevPro use different names for the base types.  While the terms are
  * the same, they are arranged in a different order.  Some terms, such as int,
  * are implied in one, and explicitly named in the other.  Given a base type
  * as input, this routine will return a common name, along with an intr_t
  * that reflects said name.
  */
 static intr_t *
 die_base_name_parse(const char *name, char **newp)
 {
-	char buf[100];
+	char buf[256];
 	char const *base;
 	char *c;
 	int nlong = 0, nshort = 0, nchar = 0, nint = 0;
 	int sign = 1;
 	char fmt = '\0';
 	intr_t *intr;
 
 	if (strlen(name) > sizeof (buf) - 1)
 		terminate("base type name \"%s\" is too long\n", name);
 
 	strncpy(buf, name, sizeof (buf));
 
 	for (c = strtok(buf, " "); c != NULL; c = strtok(NULL, " ")) {
 		if (strcmp(c, "signed") == 0)
 			sign = 1;
 		else if (strcmp(c, "unsigned") == 0)
 			sign = 0;
 		else if (strcmp(c, "long") == 0)
 			nlong++;
 		else if (strcmp(c, "char") == 0) {
 			nchar++;
 			fmt = 'c';
 		} else if (strcmp(c, "short") == 0)
 			nshort++;
 		else if (strcmp(c, "int") == 0)
 			nint++;
 		else {
 			/*
 			 * If we don't recognize any of the tokens, we'll tell
 			 * the caller to fall back to the dwarf-provided
 			 * encoding information.
 			 */
 			return (NULL);
 		}
 	}
 
 	if (nchar > 1 || nshort > 1 || nint > 1 || nlong > 2)
 		return (NULL);
 
 	if (nchar > 0) {
 		if (nlong > 0 || nshort > 0 || nint > 0)
 			return (NULL);
 
 		base = "char";
 
 	} else if (nshort > 0) {
 		if (nlong > 0)
 			return (NULL);
 
 		base = "short";
 
 	} else if (nlong > 0) {
 		base = "long";
 
 	} else {
 		base = "int";
 	}
 
 	intr = xcalloc(sizeof (intr_t));
 	intr->intr_type = INTR_INT;
 	intr->intr_signed = sign;
 	intr->intr_iformat = fmt;
 
 	snprintf(buf, sizeof (buf), "%s%s%s",
 	    (sign ? "" : "unsigned "),
 	    (nlong > 1 ? "long " : ""),
 	    base);
 
 	*newp = xstrdup(buf);
 	return (intr);
 }
 
 typedef struct fp_size_map {
 	size_t fsm_typesz[2];	/* size of {32,64} type */
 	uint_t fsm_enc[3];	/* CTF_FP_* for {bare,cplx,imagry} type */
 } fp_size_map_t;
 
 static const fp_size_map_t fp_encodings[] = {
 	{ { 4, 4 }, { CTF_FP_SINGLE, CTF_FP_CPLX, CTF_FP_IMAGRY } },
 	{ { 8, 8 }, { CTF_FP_DOUBLE, CTF_FP_DCPLX, CTF_FP_DIMAGRY } },
 #ifdef __sparc
 	{ { 16, 16 }, { CTF_FP_LDOUBLE, CTF_FP_LDCPLX, CTF_FP_LDIMAGRY } },
 #else
 	{ { 12, 16 }, { CTF_FP_LDOUBLE, CTF_FP_LDCPLX, CTF_FP_LDIMAGRY } },
 #endif
 	{ { 0, 0 }, { 0, 0, 0 } }
 };
 
 static uint_t
 die_base_type2enc(dwarf_t *dw, Dwarf_Off off, Dwarf_Signed enc, size_t sz)
 {
 	const fp_size_map_t *map = fp_encodings;
 	uint_t szidx = dw->dw_ptrsz == sizeof (uint64_t);
 	uint_t mult = 1, col = 0;
 
 	if (enc == DW_ATE_complex_float) {
 		mult = 2;
 		col = 1;
 	} else if (enc == DW_ATE_imaginary_float
 #ifdef illumos
 	    || enc == DW_ATE_SUN_imaginary_float
 #endif
 	    )
 		col = 2;
 
 	while (map->fsm_typesz[szidx] != 0) {
 		if (map->fsm_typesz[szidx] * mult == sz)
 			return (map->fsm_enc[col]);
 		map++;
 	}
 
 	terminate("die %llu: unrecognized real type size %u\n", off, sz);
 	/*NOTREACHED*/
 	return (0);
 }
 
 static intr_t *
 die_base_from_dwarf(dwarf_t *dw, Dwarf_Die base, Dwarf_Off off, size_t sz)
 {
 	intr_t *intr = xcalloc(sizeof (intr_t));
 	Dwarf_Signed enc;
 
 	(void) die_signed(dw, base, DW_AT_encoding, &enc, DW_ATTR_REQ);
 
 	switch (enc) {
 	case DW_ATE_unsigned:
 	case DW_ATE_address:
 		intr->intr_type = INTR_INT;
 		break;
 	case DW_ATE_unsigned_char:
 		intr->intr_type = INTR_INT;
 		intr->intr_iformat = 'c';
 		break;
 	case DW_ATE_signed:
 		intr->intr_type = INTR_INT;
 		intr->intr_signed = 1;
 		break;
 	case DW_ATE_signed_char:
 		intr->intr_type = INTR_INT;
 		intr->intr_signed = 1;
 		intr->intr_iformat = 'c';
 		break;
 	case DW_ATE_boolean:
 		intr->intr_type = INTR_INT;
 		intr->intr_signed = 1;
 		intr->intr_iformat = 'b';
 		break;
 	case DW_ATE_float:
 	case DW_ATE_complex_float:
 	case DW_ATE_imaginary_float:
 #ifdef illumos
 	case DW_ATE_SUN_imaginary_float:
 	case DW_ATE_SUN_interval_float:
 #endif
 		intr->intr_type = INTR_REAL;
 		intr->intr_signed = 1;
 		intr->intr_fformat = die_base_type2enc(dw, off, enc, sz);
 		break;
 	default:
 		terminate("die %llu: unknown base type encoding 0x%llx\n",
 		    off, enc);
 	}
 
 	return (intr);
 }
 
 static void
 die_base_create(dwarf_t *dw, Dwarf_Die base, Dwarf_Off off, tdesc_t *tdp)
 {
 	Dwarf_Unsigned sz;
 	intr_t *intr;
 	char *new;
 
 	debug(3, "die %llu: creating base type\n", off);
 
 	/*
 	 * The compilers have their own clever (internally inconsistent) ideas
 	 * as to what base types should look like.  Some times gcc will, for
 	 * example, use DW_ATE_signed_char for char.  Other times, however, it
 	 * will use DW_ATE_signed.  Needless to say, this causes some problems
 	 * down the road, particularly with merging.  We do, however, use the
 	 * DWARF idea of type sizes, as this allows us to avoid caring about
 	 * the data model.
 	 */
 	(void) die_unsigned(dw, base, DW_AT_byte_size, &sz, DW_ATTR_REQ);
 
 	if (tdp->t_name == NULL)
 		terminate("die %llu: base type without name\n", off);
 
 	/* XXX make a name parser for float too */
 	if ((intr = die_base_name_parse(tdp->t_name, &new)) != NULL) {
 		/* Found it.  We'll use the parsed version */
 		debug(3, "die %llu: name \"%s\" remapped to \"%s\"\n", off,
 		    tdesc_name(tdp), new);
 
 		free(tdp->t_name);
 		tdp->t_name = new;
 	} else {
 		/*
 		 * We didn't recognize the type, so we'll create an intr_t
 		 * based on the DWARF data.
 		 */
 		debug(3, "die %llu: using dwarf data for base \"%s\"\n", off,
 		    tdesc_name(tdp));
 
 		intr = die_base_from_dwarf(dw, base, off, sz);
 	}
 
 	intr->intr_nbits = sz * 8;
 
 	tdp->t_type = INTRINSIC;
 	tdp->t_intr = intr;
 	tdp->t_size = sz;
 
 	tdp->t_flags |= TDESC_F_RESOLVED;
 }
 
 static void
 die_through_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp,
     int type, const char *typename)
 {
 	Dwarf_Attribute attr;
 
 	debug(3, "die %llu <%llx>: creating %s type %d\n", off, off, typename, type);
 
 	tdp->t_type = type;
 
 	if ((attr = die_attr(dw, die, DW_AT_type, 0)) != NULL) {
 		tdp->t_tdesc = die_lookup_pass1(dw, die, DW_AT_type);
 	} else {
 		tdp->t_tdesc = tdesc_intr_void(dw);
 	}
 
 	if (type == POINTER)
 		tdp->t_size = dw->dw_ptrsz;
 
 	tdp->t_flags |= TDESC_F_RESOLVED;
 
 	if (type == TYPEDEF) {
 		iidesc_t *ii = xcalloc(sizeof (iidesc_t));
 		ii->ii_type = II_TYPE;
 		ii->ii_name = xstrdup(tdp->t_name);
 		ii->ii_dtype = tdp;
 
 		iidesc_add(dw->dw_td->td_iihash, ii);
 	}
 }
 
 static void
 die_typedef_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
 {
 	die_through_create(dw, die, off, tdp, TYPEDEF, "typedef");
 }
 
 static void
 die_const_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
 {
 	die_through_create(dw, die, off, tdp, CONST, "const");
 }
 
 static void
 die_pointer_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
 {
 	die_through_create(dw, die, off, tdp, POINTER, "pointer");
 }
 
 static void
 die_restrict_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
 {
 	die_through_create(dw, die, off, tdp, RESTRICT, "restrict");
 }
 
 static void
 die_volatile_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp)
 {
 	die_through_create(dw, die, off, tdp, VOLATILE, "volatile");
 }
 
 /*ARGSUSED3*/
 static void
 die_function_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp __unused)
 {
 	Dwarf_Die arg;
 	Dwarf_Half tag;
 	iidesc_t *ii;
 	char *name;
 
 	debug(3, "die %llu <%llx>: creating function definition\n", off, off);
 
 	/*
 	 * We'll begin by processing any type definition nodes that may be
 	 * lurking underneath this one.
 	 */
 	for (arg = die_child(dw, die); arg != NULL;
 	    arg = die_sibling(dw, arg)) {
 		if ((tag = die_tag(dw, arg)) != DW_TAG_formal_parameter &&
 		    tag != DW_TAG_variable) {
 			/* Nested type declaration */
 			die_create_one(dw, arg);
 		}
 	}
 
 	if (die_isdecl(dw, die) || (name = die_name(dw, die)) == NULL) {
 		/*
 		 * We process neither prototypes nor subprograms without
 		 * names.
 		 */
 		return;
 	}
 
 	ii = xcalloc(sizeof (iidesc_t));
 	ii->ii_type = die_isglobal(dw, die) ? II_GFUN : II_SFUN;
 	ii->ii_name = name;
 	if (ii->ii_type == II_SFUN)
 		ii->ii_owner = xstrdup(dw->dw_cuname);
 
 	debug(3, "die %llu: function %s is %s\n", off, ii->ii_name,
 	    (ii->ii_type == II_GFUN ? "global" : "static"));
 
 	if (die_attr(dw, die, DW_AT_type, 0) != NULL)
 		ii->ii_dtype = die_lookup_pass1(dw, die, DW_AT_type);
 	else
 		ii->ii_dtype = tdesc_intr_void(dw);
 
 	for (arg = die_child(dw, die); arg != NULL;
 	    arg = die_sibling(dw, arg)) {
 		char *name1;
 
 		debug(3, "die %llu: looking at sub member at %llu\n",
 		    off, die_off(dw, die));
 
 		if (die_tag(dw, arg) != DW_TAG_formal_parameter)
 			continue;
 
 		if ((name1 = die_name(dw, arg)) == NULL) {
 			terminate("die %llu: func arg %d has no name\n",
 			    off, ii->ii_nargs + 1);
 		}
 
 		if (strcmp(name1, "...") == 0) {
 			free(name1);
 			ii->ii_vargs = 1;
 			continue;
 		}
 		free(name1);
 
 		ii->ii_nargs++;
 	}
 
 	if (ii->ii_nargs > 0) {
 		int i;
 
 		debug(3, "die %llu: function has %d argument%s\n", off,
 		    ii->ii_nargs, (ii->ii_nargs == 1 ? "" : "s"));
 
 		ii->ii_args = xcalloc(sizeof (tdesc_t) * ii->ii_nargs);
 
 		for (arg = die_child(dw, die), i = 0;
 		    arg != NULL && i < ii->ii_nargs;
 		    arg = die_sibling(dw, arg)) {
 			if (die_tag(dw, arg) != DW_TAG_formal_parameter)
 				continue;
 
 			ii->ii_args[i++] = die_lookup_pass1(dw, arg,
 			    DW_AT_type);
 		}
 	}
 
 	iidesc_add(dw->dw_td->td_iihash, ii);
 }
 
 /*ARGSUSED3*/
 static void
 die_variable_create(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off, tdesc_t *tdp __unused)
 {
 	iidesc_t *ii;
 	char *name;
 
 	debug(3, "die %llu: creating object definition\n", off);
 
 	if (die_isdecl(dw, die) || (name = die_name(dw, die)) == NULL)
 		return; /* skip prototypes and nameless objects */
 
 	ii = xcalloc(sizeof (iidesc_t));
 	ii->ii_type = die_isglobal(dw, die) ? II_GVAR : II_SVAR;
 	ii->ii_name = name;
 	ii->ii_dtype = die_lookup_pass1(dw, die, DW_AT_type);
 	if (ii->ii_type == II_SVAR)
 		ii->ii_owner = xstrdup(dw->dw_cuname);
 
 	iidesc_add(dw->dw_td->td_iihash, ii);
 }
 
 /*ARGSUSED2*/
 static int
 die_fwd_resolve(tdesc_t *fwd, tdesc_t **fwdp, void *private __unused)
 {
 	if (fwd->t_flags & TDESC_F_RESOLVED)
 		return (1);
 
 	if (fwd->t_tdesc != NULL) {
 		debug(3, "tdp %u: unforwarded %s\n", fwd->t_id,
 		    tdesc_name(fwd));
 		*fwdp = fwd->t_tdesc;
 	}
 
 	fwd->t_flags |= TDESC_F_RESOLVED;
 
 	return (1);
 }
 
 /*ARGSUSED*/
 static void
 die_lexblk_descend(dwarf_t *dw, Dwarf_Die die, Dwarf_Off off __unused, tdesc_t *tdp __unused)
 {
 	Dwarf_Die child = die_child(dw, die);
 
 	if (child != NULL)
 		die_create(dw, child);
 }
 
 /*
  * Used to map the die to a routine which can parse it, using the tag to do the
  * mapping.  While the processing of most tags entails the creation of a tdesc,
  * there are a few which don't - primarily those which result in the creation of
  * iidescs which refer to existing tdescs.
  */
 
 #define	DW_F_NOTDP	0x1	/* Don't create a tdesc for the creator */
 
 typedef struct die_creator {
 	Dwarf_Half dc_tag;
 	uint16_t dc_flags;
 	void (*dc_create)(dwarf_t *, Dwarf_Die, Dwarf_Off, tdesc_t *);
 } die_creator_t;
 
 static const die_creator_t die_creators[] = {
 	{ DW_TAG_array_type,		0,		die_array_create },
 	{ DW_TAG_enumeration_type,	0,		die_enum_create },
 	{ DW_TAG_lexical_block,		DW_F_NOTDP,	die_lexblk_descend },
 	{ DW_TAG_pointer_type,		0,		die_pointer_create },
 	{ DW_TAG_structure_type,	0,		die_struct_create },
 	{ DW_TAG_subroutine_type,	0,		die_funcptr_create },
 	{ DW_TAG_typedef,		0,		die_typedef_create },
 	{ DW_TAG_union_type,		0,		die_union_create },
 	{ DW_TAG_base_type,		0,		die_base_create },
 	{ DW_TAG_const_type,		0,		die_const_create },
 	{ DW_TAG_subprogram,		DW_F_NOTDP,	die_function_create },
 	{ DW_TAG_variable,		DW_F_NOTDP,	die_variable_create },
 	{ DW_TAG_volatile_type,		0,		die_volatile_create },
 	{ DW_TAG_restrict_type,		0,		die_restrict_create },
 	{ 0, 0, NULL }
 };
 
 static const die_creator_t *
 die_tag2ctor(Dwarf_Half tag)
 {
 	const die_creator_t *dc;
 
 	for (dc = die_creators; dc->dc_create != NULL; dc++) {
 		if (dc->dc_tag == tag)
 			return (dc);
 	}
 
 	return (NULL);
 }
 
 static void
 die_create_one(dwarf_t *dw, Dwarf_Die die)
 {
 	Dwarf_Off off = die_off(dw, die);
 	const die_creator_t *dc;
 	Dwarf_Half tag;
 	tdesc_t *tdp;
 
 	debug(3, "die %llu <%llx>: create_one\n", off, off);
 
 	if (off > dw->dw_maxoff) {
 		terminate("illegal die offset %llu (max %llu)\n", off,
 		    dw->dw_maxoff);
 	}
 
 	tag = die_tag(dw, die);
 
 	if ((dc = die_tag2ctor(tag)) == NULL) {
 		debug(2, "die %llu: ignoring tag type %x\n", off, tag);
 		return;
 	}
 
 	if ((tdp = tdesc_lookup(dw, off)) == NULL &&
 	    !(dc->dc_flags & DW_F_NOTDP)) {
 		tdp = xcalloc(sizeof (tdesc_t));
 		tdp->t_id = off;
 		tdesc_add(dw, tdp);
 	}
 
 	if (tdp != NULL)
 		tdp->t_name = die_name(dw, die);
 
 	dc->dc_create(dw, die, off, tdp);
 }
 
 static void
 die_create(dwarf_t *dw, Dwarf_Die die)
 {
 	do {
 		die_create_one(dw, die);
 	} while ((die = die_sibling(dw, die)) != NULL);
 }
 
 static tdtrav_cb_f die_resolvers[] = {
 	NULL,
 	NULL,			/* intrinsic */
 	NULL,			/* pointer */
 	die_array_resolve,	/* array */
 	NULL,			/* function */
 	die_sou_resolve,	/* struct */
 	die_sou_resolve,	/* union */
 	die_enum_resolve,	/* enum */
 	die_fwd_resolve,	/* forward */
 	NULL,			/* typedef */
 	NULL,			/* typedef unres */
 	NULL,			/* volatile */
 	NULL,			/* const */
 	NULL,			/* restrict */
 };
 
 static tdtrav_cb_f die_fail_reporters[] = {
 	NULL,
 	NULL,			/* intrinsic */
 	NULL,			/* pointer */
 	die_array_failed,	/* array */
 	NULL,			/* function */
 	die_sou_failed,		/* struct */
 	die_sou_failed,		/* union */
 	NULL,			/* enum */
 	NULL,			/* forward */
 	NULL,			/* typedef */
 	NULL,			/* typedef unres */
 	NULL,			/* volatile */
 	NULL,			/* const */
 	NULL,			/* restrict */
 };
 
 static void
 die_resolve(dwarf_t *dw)
 {
 	int last = -1;
 	int pass = 0;
 
 	do {
 		pass++;
 		dw->dw_nunres = 0;
 
 		(void) iitraverse_hash(dw->dw_td->td_iihash,
 		    &dw->dw_td->td_curvgen, NULL, NULL, die_resolvers, dw);
 
 		debug(3, "resolve: pass %d, %u left\n", pass, dw->dw_nunres);
 
 		if ((int) dw->dw_nunres == last) {
 			fprintf(stderr, "%s: failed to resolve the following "
 			    "types:\n", progname);
 
 			(void) iitraverse_hash(dw->dw_td->td_iihash,
 			    &dw->dw_td->td_curvgen, NULL, NULL,
 			    die_fail_reporters, dw);
 
 			terminate("failed to resolve types\n");
 		}
 
 		last = dw->dw_nunres;
 
 	} while (dw->dw_nunres != 0);
 }
 
 /*
  * Any object containing a function or object symbol at any scope should also
  * contain DWARF data.
  */
 static boolean_t
 should_have_dwarf(Elf *elf)
 {
 	Elf_Scn *scn = NULL;
 	Elf_Data *data = NULL;
 	GElf_Shdr shdr;
 	GElf_Sym sym;
 	uint32_t symdx = 0;
 	size_t nsyms = 0;
 	boolean_t found = B_FALSE;
 
 	while ((scn = elf_nextscn(elf, scn)) != NULL) {
 		gelf_getshdr(scn, &shdr);
 
 		if (shdr.sh_type == SHT_SYMTAB) {
 			found = B_TRUE;
 			break;
 		}
 	}
 
 	if (!found)
 		terminate("cannot convert stripped objects\n");
 
 	data = elf_getdata(scn, NULL);
 	nsyms = shdr.sh_size / shdr.sh_entsize;
 
 	for (symdx = 0; symdx < nsyms; symdx++) {
 		gelf_getsym(data, symdx, &sym);
 
 		if ((GELF_ST_TYPE(sym.st_info) == STT_FUNC) ||
 		    (GELF_ST_TYPE(sym.st_info) == STT_TLS) ||
 		    (GELF_ST_TYPE(sym.st_info) == STT_OBJECT)) {
 			char *name;
 
 			name = elf_strptr(elf, shdr.sh_link, sym.st_name);
 
 			/* Studio emits these local symbols regardless */
 			if ((strcmp(name, "Bbss.bss") != 0) &&
 			    (strcmp(name, "Ttbss.bss") != 0) &&
 			    (strcmp(name, "Ddata.data") != 0) &&
 			    (strcmp(name, "Ttdata.data") != 0) &&
 			    (strcmp(name, "Drodata.rodata") != 0))
 				return (B_TRUE);
 		}
 	}
 
 	return (B_FALSE);
 }
 
 /*ARGSUSED*/
 int
 dw_read(tdata_t *td, Elf *elf, char *filename __unused)
 {
 	Dwarf_Unsigned abboff, hdrlen, lang, nxthdr;
 	Dwarf_Half vers, addrsz, offsz;
 	Dwarf_Die cu = 0;
 	Dwarf_Die child = 0;
 	dwarf_t dw;
 	char *prod = NULL;
 	int rc;
 
 	bzero(&dw, sizeof (dwarf_t));
 	dw.dw_td = td;
 	dw.dw_ptrsz = elf_ptrsz(elf);
 	dw.dw_mfgtid_last = TID_MFGTID_BASE;
 	dw.dw_tidhash = hash_new(TDESC_HASH_BUCKETS, tdesc_idhash, tdesc_idcmp);
 	dw.dw_fwdhash = hash_new(TDESC_HASH_BUCKETS, tdesc_namehash,
 	    tdesc_namecmp);
 	dw.dw_enumhash = hash_new(TDESC_HASH_BUCKETS, tdesc_namehash,
 	    tdesc_namecmp);
 
 	if ((rc = dwarf_elf_init(elf, DW_DLC_READ, NULL, NULL, &dw.dw_dw,
 	    &dw.dw_err)) == DW_DLV_NO_ENTRY) {
 		if (should_have_dwarf(elf)) {
 			errno = ENOENT;
 			return (-1);
 		} else {
 			return (0);
 		}
 	} else if (rc != DW_DLV_OK) {
 		if (dwarf_errno(dw.dw_err) == DW_DLE_DEBUG_INFO_NULL) {
 			/*
 			 * There's no type data in the DWARF section, but
 			 * libdwarf is too clever to handle that properly.
 			 */
 			return (0);
 		}
 
 		terminate("failed to initialize DWARF: %s\n",
 		    dwarf_errmsg(dw.dw_err));
 	}
 
 	if ((rc = dwarf_next_cu_header_b(dw.dw_dw, &hdrlen, &vers, &abboff,
 	    &addrsz, &offsz, NULL, &nxthdr, &dw.dw_err)) != DW_DLV_OK) {
 		if (dw.dw_err.err_error == DW_DLE_NO_ENTRY)
 			exit(0);
 		else
 			terminate("rc = %d %s\n", rc, dwarf_errmsg(dw.dw_err));
 	}
 	if ((cu = die_sibling(&dw, NULL)) == NULL ||
 	    (((child = die_child(&dw, cu)) == NULL) &&
 	    should_have_dwarf(elf))) {
 		terminate("file does not contain dwarf type data "
 		    "(try compiling with -g)\n");
 	} else if (child == NULL) {
 		return (0);
 	}
 
 	dw.dw_maxoff = nxthdr - 1;
 
 	if (dw.dw_maxoff > TID_FILEMAX)
 		terminate("file contains too many types\n");
 
 	debug(1, "DWARF version: %d\n", vers);
 	if (vers < 2 || vers > 4) {
 		terminate("file contains incompatible version %d DWARF code "
 		    "(version 2, 3 or 4 required)\n", vers);
 	}
 
 	if (die_string(&dw, cu, DW_AT_producer, &prod, 0)) {
 		debug(1, "DWARF emitter: %s\n", prod);
 		free(prod);
 	}
 
 	if (dwarf_attrval_unsigned(cu, DW_AT_language, &lang, &dw.dw_err) == 0)
 		switch (lang) {
 		case DW_LANG_C:
 		case DW_LANG_C89:
 		case DW_LANG_C99:
 		case DW_LANG_C11:
 		case DW_LANG_C_plus_plus:
 		case DW_LANG_C_plus_plus_03:
 		case DW_LANG_C_plus_plus_11:
 		case DW_LANG_C_plus_plus_14:
 		case DW_LANG_Mips_Assembler:
 			break;
 		default:
 			terminate("file contains DWARF for unsupported "
 			    "language %#x", lang);
 		}
 	else
 		warning("die %llu: failed to get language attribute: %s\n",
 		    die_off(&dw, cu), dwarf_errmsg(dw.dw_err));
 
 	if ((dw.dw_cuname = die_name(&dw, cu)) != NULL) {
 		char *base = xstrdup(basename(dw.dw_cuname));
 		free(dw.dw_cuname);
 		dw.dw_cuname = base;
 
 		debug(1, "CU name: %s\n", dw.dw_cuname);
 	}
 
 	if ((child = die_child(&dw, cu)) != NULL)
 		die_create(&dw, child);
 
 	if ((rc = dwarf_next_cu_header_b(dw.dw_dw, &hdrlen, &vers, &abboff,
 	    &addrsz, &offsz, NULL, &nxthdr, &dw.dw_err)) != DW_DLV_NO_ENTRY)
 		terminate("multiple compilation units not supported\n");
 
 	(void) dwarf_finish(dw.dw_dw, &dw.dw_err);
 
 	die_resolve(&dw);
 
 	cvt_fixups(td, dw.dw_ptrsz);
 
 	/* leak the dwarf_t */
 
 	return (0);
 }
Index: projects/clang800-import/cddl/contrib/opensolaris
===================================================================
--- projects/clang800-import/cddl/contrib/opensolaris	(revision 344548)
+++ projects/clang800-import/cddl/contrib/opensolaris	(revision 344549)

Property changes on: projects/clang800-import/cddl/contrib/opensolaris
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/cddl/contrib/opensolaris:r344513-344548
Index: projects/clang800-import/cddl
===================================================================
--- projects/clang800-import/cddl	(revision 344548)
+++ projects/clang800-import/cddl	(revision 344549)

Property changes on: projects/clang800-import/cddl
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/cddl:r344513-344548
Index: projects/clang800-import/contrib/openpam/CREDITS
===================================================================
--- projects/clang800-import/contrib/openpam/CREDITS	(revision 344548)
+++ projects/clang800-import/contrib/openpam/CREDITS	(revision 344549)
@@ -1,53 +1,54 @@
 
        _Ἀπόδοτε οὖν τὰ Καίσαρος Καίσαρι καὶ τὰ τοῦ Θεοῦ τῷ Θεῷ_
 
 The OpenPAM library was developed for the FreeBSD Project by ThinkSec AS
 and Network Associates Laboratories, the Security Research Division of
 Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
 ("CBOSS"), as part of the DARPA CHATS research program.
 
 Principal design and development by:
 
 	 Dag-Erling Smørgrav <des@des.no>
 
 The following persons (in alphabetical order) have contributed,
 directly or indirectly, with patches, criticism, suggestions, or
 ideas:
 
 	Andrew Morgan <morgan@transmeta.com>
 	Ankita Pal <pal.ankita.ankita@gmail.com>
 	Baptiste Daroussin <bapt@freebsd.org>
 	Brian Fundakowski Feldman <green@freebsd.org>
 	Christos Zoulas <christos@netbsd.org>
 	Daniel Richard G. <skunk@iskunk.org>
 	Darren J. Moffat <darren.moffat@sun.com>
 	Dimitry Andric <dim@freebsd.org>
 	Dmitry V. Levin <ldv@altlinux.org>
 	Don Lewis <truckman@freebsd.org>
 	Emmanuel Dreyfus <manu@netbsd.org>
 	Eric Melville <eric@freebsd.org>
 	Espen Grøndahl <espegro@usit.uio.no>
 	Gary Winiger <gary.winiger@sun.com>
 	Gavin Atkinson <gavin@freebsd.org>
 	Gleb Smirnoff <glebius@freebsd.org>
 	Hubert Feyrer <hubert@feyrer.de>
 	Jason Evans <jasone@freebsd.org>
 	Joe Marcus Clarke <marcus@freebsd.org>
 	Jörg Sonnenberger <joerg@britannica.bec.de>
 	Juli Mallett <jmallett@freebsd.org>
 	Larry Baird <lab@gta.com>
 	Maëlle Lesage <lesage.maelle@gmail.com>
 	Mark Murray <markm@freebsd.org>
 	Matthias Drochner <drochner@netbsd.org>
 	Mike Petullo <mike@flyn.org>
 	Mikhail Teterin <mi@aldan.algebra.com>
 	Mikko Työläjärvi <mbsd@pacbell.net>
 	Nick Hibma <nick@van-laarhoven.org>
 	Patrick Bihan-Faou <patrick-fbsd@mindstep.com>
 	Robert Watson <rwatson@freebsd.org>
 	Ruslan Ermilov <ru@freebsd.org>
 	Sebastian Krahmer <sebastian.krahmer@gmail.com>
 	Solar Designer <solar@openwall.com>
 	Takanori Saneto <sanewo@ba2.so-net.ne.jp>
+	Tim Creech <tcreech@tcreech.com>
 	Wojciech A. Koszek <wkoszek@freebsd.org>
 	Yar Tikhiy <yar@freebsd.org>
Index: projects/clang800-import/contrib/openpam/HISTORY
===================================================================
--- projects/clang800-import/contrib/openpam/HISTORY	(revision 344548)
+++ projects/clang800-import/contrib/openpam/HISTORY	(revision 344549)
@@ -1,489 +1,496 @@
+OpenPAM Tabebuia						2019-02-24
+
+ - BUGFIX: Fix off-by-one bug in pam_getenv(3) which was introduced in
+   OpenPAM Radula.
+
+ - ENHANCE: Add unit tests for pam_{get,put,set}env(3).
+============================================================================
 OpenPAM Resedacea						2017-04-30
 
  - BUGFIX: Reinstore the NULL check in pam_end(3) which was removed in
    OpenPAM Radula, as it breaks common error-handling constructs.
 
  - BUGFIX: Return PAM_SYMBOL_ERR instead of PAM_SYSTEM_ERR from the
    dispatcher when the required service function could not be found.
- 
+
  - ENHANCE: Introduce the PAM_BAD_HANDLE error code for when pamh is
    NULL in API functions that have a NULL check.
 
  - ENHANCE: Introduce the PAM_BAD_ITEM, PAM_BAD_FEATURE and
    PAM_BAD_CONSTANT error codes for situations where we previously
    incorrectly used PAM_SYMBOL_ERR to denote that an invalid constant
    had been passed to an API function.
 
  - ENHANCE: Improve the RETURN VALUES section in API man pages,
    especially for functions that cannot fail, which were incorrectly
    documented as returning -1 on failure.
 ============================================================================
 OpenPAM Radula							2017-02-19
 
  - BUGFIX: Fix an inverted test which prevented pam_get_authtok(3) and
    pam_get_user(3) from using application-provided custom prompts.
 
  - BUGFIX: Plug a memory leak in pam_set_item(3).
 
  - BUGFIX: Plug a potential memory leak in openpam_readlinev(3).
 
  - BUGFIX: In openpam_readword(3), support line continuations within
    whitespace.
 
  - ENHANCE: Add a feature flag to control fallback to "other" policy.
 
  - ENHANCE: Add a pam_return(8) module which returns an arbitrary
    code specified in the module options.
 
  - ENHANCE: More and better unit tests.
 ============================================================================
 OpenPAM Ourouparia						2014-09-12
 
  - ENHANCE: When executing a chain, require at least one service
    function to succeed.  This mitigates fail-open scenarios caused by
    misconfigurations or missing modules.
 
  - ENHANCE: Make sure to overwrite buffers which may have contained an
    authentication token when they're no longer needed.
 
  - BUGFIX: Under certain circumstances, specifying a non-existent
    module (or misspelling the name of a module) in a policy could
    result in a fail-open scenario.  (CVE-2014-3879)
 
  - FEATURE: Add a search path for modules.  This was implemented in
    Nummularia but inadvertently left out of the release notes.
 
  - BUGFIX: The is_upper() predicate only accepted the letter A as an
    upper-case character instead of the entire A-Z range.  As a result,
    service and module names containing upper-case letters other than A
    would be rejected.
 ============================================================================
 OpenPAM Nummularia						2013-09-07
 
  - ENHANCE: Rewrite the dynamic loader to improve readability and
    reliability.  Modules can now be listed without the ".so" suffix in
    the policy file; OpenPAM will automatically add it, just like it
    will automatically add the version number if required.
 
  - ENHANCE: Allow openpam_straddch(3) to be called without a character
    so it can be used to preallocate a string.
 
  - ENHANCE: Improve portability by adding simple asprintf(3) and
    vasprintf(3) implementations for platforms that don't have them.
 
  - ENHANCE: Move the libpam sources into a separate subdirectory.
 
  - ENHANCE: Substantial documentation improvements.
 
  - BUGFIX: When openpam_readword(3) encountered an opening quote, it
    would set the first byte in the buffer to '\0', discarding all
    existing text and, unless the buffer was empty to begin with, all
    subsequent text as well.  This went unnoticed because none of the
    unit tests for quoted strings had any text preceding the opening
    quote.
 
  - BUGFIX: make --with-modules-dir work the way it was meant to work
    (but never did).
 ============================================================================
 OpenPAM Micrampelis						2012-05-26
 
  - FEATURE: Add an openpam_readword(3) function which reads the next
    word from an input stream, applying shell quoting and escaping
    rules.  Add numerous unit tests for openpam_readword(3).
 
  - FEATURE: Add an openpam_readlinev(3) function which uses the
    openpam_readword(3) function to read words from an input stream one
    at a time until it reaches an unquoted, unescaped newline, and
    returns an array of those words.  Add several unit tests for
    openpam_readlinev(3).
 
  - FEATURE: Add a PAM_HOST item which pam_start(3) initializes to the
    machine's hostname.  This was implemented in Lycopsida but
    inadvertantly left out of the release notes.
 
  - FEATURE: In pam_get_authtok(3), if neither the application nor the
    module have specified a prompt and PAM_HOST and PAM_RHOST are both
    defined but not equal, use a different default prompt that includes
    PAM_USER and PAM_HOST.
 
  - ENHANCE: Rewrite the policy parser to used openpam_readlinev(),
    which greatly simplifies the code.
 
  - ENHANCE: The previous implementation of the policy parser relied on
    the openpam_readline(3) function, which (by design) munges
    whitespace and understands neither quotes nor backslash escapes.
    As a result of the aforementioned rewrite, whitespace, quotes and
    backslash escapes in policy files are now handled in a consistent
    and predictable manner.
 
  - ENHANCE: On platforms that have it, use fdlopen(3) to load modules.
    This closes the race between the ownership / permission check and
    the dlopen(3) call.
 
  - ENHANCE: Reduce the amount of pointless error messages generated
    while searching for a module.
 
  - ENHANCE: Numerous documentation improvements, both in content and
    formatting.
 
  - BUGFIX: A patch incorporated in Lycopsida inadvertantly changed
    OpenPAM's behavior when several policies exist for the same
    service, from ignoring all but the first to concatenating them all.
    Revert to the original behavior.
 
  - BUGFIX: Plug a memory leak in the policy parser.
 ============================================================================
 OpenPAM Lycopsida						2011-12-18
 
  - ENHANCE: removed static build autodetection, which didn't work
    anyway.  Use an explicit, user-specified preprocessor variable
    instead.
 
  - ENHANCE: cleaned up the documentation a bit.
 
  - ENHANCE: added openpam_subst(3), allowing certain PAM items to be
    embedded in strings such as prompts.  Apply it to the prompts used
    by pam_get_user(3) and pam_get_authtok(3).
 
  - ENHANCE: added support for the user_prompt, authtok_prompt and
    oldauthtok_prompt module options, which override the prompts passed
    by the module to pam_set_user(3) and pam_get_authtok(3).
 
  - ENHANCE: rewrote the policy parser to support quoted option values.
 
  - ENHANCE: added pamtest(1), a tool for testing modules and policies.
 
  - ENHANCE: added code to check the ownership and permissions of a
    module before loading it.
 
  - ENHANCE: added / improved input validation in many cases, including
    the policy file and some function arguments.  (CVE-2011-4122)
 ============================================================================
 OpenPAM Hydrangea						2007-12-21
 
  - ENHANCE: when compiling with GCC, mark up API functions with GCC
    attributes where appropriate.
 
  - BUGFIX: fixed numerous warnings uncovered by GCC 4.
 
  - ENHANCE: building the documentation is now optional.
 
  - ENHANCE: corrected a number of mistakes and style issues in the
    build system.
 
  - ENHANCE: API function arguments are now const where appropriate, to
    match corresponding changes in the Solaris PAM and Linux-PAM APIs.
 
  - ENHANCE: corrected a number of C namespace violations.
 
  - ENHANCE: the module cache has been removed, allowing long-lived
    applications to pick up module changes.  This also allows multiple
    threads to use PAM simultaneously (as long as they use separate PAM
    contexts), since the module cache was the only part of OpenPAM that
    was not thread-safe.
 ============================================================================
 OpenPAM Figwort							2005-06-16
 
  - BUGFIX: Correct several small signedness and initialization bugs
    discovered during review by the NetBSD team.
 
  - BUGFIX: Modify gendoc.pl to sort cross-references in dictionary
    order within each section.
 
  - ENHANCE: if a policy specifies a relative module path, prepend the
    module directory so we never call dlopen(3) with a relative path.
 
  - ENHANCE: add a pam.conf(5) manual page.
 ============================================================================
 OpenPAM Feterita						2005-02-01
 
  - BUGFIX: Correct numerous markup errors, invalid cross-references,
    and other issues in the manual pages, with kind assistance from
    Ruslan Ermilov <ru@freebsd.org>.
 
  - BUGFIX: Avoid multiple evaluation of macro arguments in ENTERX()
    and RETURNX() macros.
 
  - BUGFIX: Remove an unnecessary and non-portable pointer cast in
    pam_get_data(3).
 
  - BUGFIX: Fix identical typos in PAM_ACCT_EXPIRED case in
    pam_strerror(3) and gendoc.pl.
 
  - ENHANCE: Minor overhaul of the autoconf / build system.
 
  - ENHANCE: Add openpam_free_envlist(3).
 ============================================================================
 OpenPAM Eelgrass						2004-02-10
 
  - BUGFIX: Correct array handling bugs in conversation code.
 
  - BUGFIX: In openpam_ttyconv(3), don't strip trailing linear
    whitespace from the user's response.
 
  - BUGFIX: Many constness issues addressed.
 ============================================================================
 OpenPAM Dogwood							2003-07-15
 
  - ENHANCE: Use the GNU autotools.
 
  - ENHANCE: Constify the msg field in struct pam_message.
 
  - BUGFIX: Remove left-over debugging output
 
  - BUGFIX: Avoid side effects in arguments to the FREE() macro
 
  - ENHANCE: Make openpam_ttyconv(3) use read(2) rather than fgets(3).
 
  - BUGFIX: Staticize some variables which shouldn't be global.
 
  - BUGFIX: Correcly anticipate a NULL user in pam_get_user(3).
 
  - ENHANCE: Various minor documentation improvements.
 
 Thanks to Dmitry V. Levin <ldv@altlinux.org> for considerable
 assistance with this release.
 ============================================================================
 OpenPAM Digitalis						2003-06-01
 
  - ENHANCE: Completely rewrite the configuration parser and add
    support for the "include" control flag.
 
  - ENHANCE: Improve portability to NetBSD, OpenBSD and Linux.
 
  - ENHANCE: Lots of additional paranoia.
 
  - BUGFIX: The sample su(1) application dropped privileges before
    forking instead of after.
 
  - ENHANCE: Document openpam_log(3).
 
  - ENHANCE: Other minor documentation fixes.
 
 Thanks to Dmitry V. Levin <ldv@altlinux.org> for considerable
 assistance with this release.
 ============================================================================
 OpenPAM Dianthus						2003-05-02
 
  - BUGFIX: Initialize some potentially uninitialized variables.
 
  - BUGFIX: Silence some warnings emitted by gcc -std=iso9899:1999.
 
  - BUGFIX: In pam_getenv(), return a pointer to the stored variable
    instead of a freshly allocated copy.
 
  - ENHANCE: Detect recursion in openpam_borrow_cred()
 
  - ENHANCE: Make borrowing one's own credentials a no-op.
 
  - ENHANCE: Further improve debugging support.
 
  - ENHANCE: Clean up some variable names.
 ============================================================================
 OpenPAM Daffodil						2003-01-06
 
  - ENHANCE: Document dependency on <sys/types.h> (for size_t)
 
  - ENHANCE: Slightly improve error detection in openpam_ttyconv().
 
  - BUGFIX: Fix several typos in debugging macros.
 ============================================================================
 OpenPAM Cyclamen						2002-12-12
 
  - ENHANCE: Improve recursion detection in openpam_dispatch().
 
  - ENHANCE: Add debugging messages at entry and exit points of most
    functions.
 
  - ENHANCE: Fix some minor style issues.
 
  - BUGFIX: Add default cases to the switches in openpam_log.c.
 
  - ENHANCE: Add /usr/local/etc/pam.conf to policy search path.
 
  - BUGFIX: In openpam_ttyconv(3), print the prompt to stdout rather
    than stderr.
 ============================================================================
 OpenPAM Citronella						2002-06-30
 
  - ENHANCE: Add the "binding" control flag (from Solaris 9).
 
  - ENHANCE: Define struct pam_repository and PAM_REPOSITORY (from
    Solaris 9).
 
  - ENHANCE: Flesh out the pam(3) man page.
 
  - ENHANCE: Add an openpam(3) page with cross-references to all the
    documented OpenPAM API extensions.
 
  - ENHANCE: Add a pam_conv(3) man page describing the conversation
    system.
 
  - ENHANCE: Improved sample application.
 
  - ENHANCE: Added sample pam_unix module.
 
  - BUGFIX: Various documentation nits.
 ============================================================================
 OpenPAM Cinquefoil						2002-05-24
 
  - BUGFIX: Various warnings uncovered by gcc 3.1.
 
  - ENHANCE: Add a null conversation function, openpam_nullconv(3).
 
  - BUGFIX: Initialize the "other" chain to all zeroes.
 
  - ENHANCE: Document openpam_ttyconv(3).
 ============================================================================
 OpenPAM Cinnamon						2002-05-02
 
  - ENHANCE: Add a null conversation function, openpam_nullconv().
 
  - BUGFIX: Various markup bugs in the documentation.
 
  - BUGFIX: Document <security/openpam.h>.
 
  - BUGFIX: Duplicate expansion of openpam_log() macro arguments.
 
  - ENHANCE: Restructure the policy-loading code and align our use of
    the "other" policy with Solaris and Linux-PAM.
 
  - ENHANCE: Log dlopen() and dlsym() failures.
 
  - ENHANCE: In openpam_ttyconv(), emit a newline after error and info
    messages unless the message contains one already.
 
  - BUGFIX: In pam_vprompt(), initialize the response pointer to NULL
    so we can detect whether the conversation function touched it.
 ============================================================================
 OpenPAM Cineraria						2002-04-14
 
  - BUGFIX: Fix confusion between token and prompt in
    pam_get_authtok(3).
 
  - ENHANCE: Improved documentation.
 
  - ENHANCE: Adopt the same preprocessor tricks that were used in
    FreeBSD's version of Linux-PAM to simplify static linking without
    requiring dummy primitives.
 
  - ENHANCE: Move the policy-loading code out of pam_start.c.
 
  - BUGFIX: Fix typo in one of the versions of the openpam_log macro.
 
  - ENHANCE: Add versioning macros.
 ============================================================================
 OpenPAM Cinchona						2002-04-08
 
  - ENHANCE: Improved documentation for several API functions.
 
  - BUGFIX: Fix bug in pam_set_data() that would result in corruption
    of the module data list.
 
  - BUGFIX: Allocate the correct amount of memory for the environment
    list in pam_putenv().
 
  - ENHANCE: Change pam_get_authtok()'s prototype so the caller can
    specify what token it wants.  Also introduce PAM_OLDAUTHTOK_PROMPT.
 
  - BUGFIX: Plug memory leak in pam_get_user() / pam_get_authtok(), and
    reduce differences between these very similar functions.
 
  - ENHANCE: Check flags carefully in pam_authenticate() and
    pam_chauthtok().
 
  - BUGFIX: Fix bugs in portability code; libpam now builds on NetBSD.
 
  - ENHANCE: In pam_get_authtok(), if PAM_OLDAUTHTOK is set, we're
    asked for PAM_AUTHTOK, and we have to prompt the user, prompt her
    twice and compare the responses.
 
  - ENHANCE: Add openpam_{borrow,restore}_cred(), for temporarily
    switching to user credentials.
 
  - ENHANCE: Add openpam_free_data(), a generic cleanup function for
    pam_set_data() consumers.
 ============================================================================
 OpenPAM Centaury						2002-03-14
 
  - BUGFIX: Add missing #include <string.h> to openpam_log.c.
 
  - BUGFIX: s/PAM_REINITIALISE_CRED/PAM_REINITIALIZE_CRED/.  XSSO uses
    the former, but Solaris and Linux-PAM use the latter.
 
  - BUGFIX: The dynamic loader and the module cache contained a number
    of bugs which would cause a segmentation fault if pam_start(3) was
    called again after pam_end(3), as happens in login(1), xdm(1) etc.
    after a failed login.
 
  - BUGFIX: Refer to a module by the name used in the policy file, even
    if the module that was actually loaded was versioned.
 
  - ENHANCE: Suppress debugging logs, unless compiled with -DDEBUG.
 ============================================================================
 OpenPAM Celandine						2002-03-05
 
  - BUGFIX: PAM_TRY_AGAIN is a valid return value for pam_chauthtok().
 
  - BUGFIX: Run passwd chain twice, first with the PAM_PRELIM_CHECK
    flag set, then with the PAM_UPDATE_AUTHTOK flag set.
 
  - BUGFIX: Failure of a "sufficient" module should not terminate the
    passwd chain if the PAM_PRELIM_CHECK flag is set.
 
  - BUGFIX: Clear PAM_AUTHTOK after running the service modules.
 
  - ENHANCE: Prevent applications from specifying the PAM_PRELIM_CHECK
    or PAM_UPDATE_AUTHTOK flags themselves.
 
  - BUGFIX: openpam_set_option() did not support changing the value of
    an existing option.
 
  - ENHANCE: Add support for module versioning.  OpenPAM will prefer a
    module with the same version number as the library itself to one
    with no version number at all.
 ============================================================================
 OpenPAM Cantaloupe						2002-02-22
 
  - BUGFIX: The proper use of PAM_SYMBOL_ERR is to indicate an invalid
    argument to pam_[gs]et_item(3), not to indicate dlsym(3) failures.
 
  - ENHANCE: Add in-line documentation in most source files, and a Perl
    script that generates mdoc code from that.
 
  - BUGFIX: The environment list was not properly NULL-terminated.
 
  - ENHANCE: Allow the PAM_AUTHTOK_PROMPT item to override the prompt
    specified by the module.
 
  - BUGFIX: PAM_NUM_ITEMS was set too low.  It has been moved to
    pam_constants.h to avoid it going stale again.
 
  - ENHANCE: Move all code related to static modules into a separate
    file.
 
  - ENHANCE: openpam_ttyconv() now masks most signals while prompting the
    user, and supports setting a timeout (which defaults to off).
 
  - BUGFIX: Some manual pages referenced XSSO even though they
    documented OpenPAM-specific functions.
 
  - ENHANCE: Added openpam_get_option() and openpam_set_option().
 
  - ENHANCE: openpam_get_authtok() now respects the echo_pass,
    try_first_pass, and use_first_pass options.
 ============================================================================
 OpenPAM Caliopsis						2002-02-13
 
 Fixed a number of bugs in the previous release, including:
   - a number of bugs in and related to pam_[gs]et_item(3)
   - off-by-one bug in pam_start.c would trim last character off certain
     configuration lines
   - incorrect ordering of an array in openpam_load.c would cause service
     module functions to get mixed up
   - missing 'continue' in openpam_dispatch.c caused successes to be
     counted as failures
 ============================================================================
 OpenPAM Calamite						2002-02-09
 
 First (beta) release.
Index: projects/clang800-import/contrib/openpam/LICENSE
===================================================================
--- projects/clang800-import/contrib/openpam/LICENSE	(revision 344548)
+++ projects/clang800-import/contrib/openpam/LICENSE	(revision 344549)
@@ -1,33 +1,33 @@
 
 Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-Copyright (c) 2004-2017 Dag-Erling Smørgrav
+Copyright (c) 2004-2019 Dag-Erling Smørgrav
 All rights reserved.
 
 This software was developed for the FreeBSD Project by ThinkSec AS and
 Network Associates Laboratories, the Security Research Division of
 Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
 ("CBOSS"), as part of the DARPA CHATS research program.
 
 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. The name of the author may not be used to endorse or promote
    products derived from this software without specific prior written
    permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
Index: projects/clang800-import/contrib/openpam/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/Makefile.in	(revision 344549)
@@ -1,832 +1,839 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @WITH_DOC_TRUE@am__append_1 = doc
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = mkpkgng
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
 	install-exec-recursive install-html-recursive \
 	install-info-recursive install-pdf-recursive \
 	install-ps-recursive install-recursive installcheck-recursive \
 	installdirs-recursive pdf-recursive ps-recursive \
 	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
   $(RECURSIVE_TARGETS) \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope distdir distdir-am dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = misc include lib bin modules doc t
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/mkpkgng.in INSTALL README TODO compile config.guess \
 	config.sub install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
   if test -d "$(distdir)"; then \
     find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
 am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
   sed_rest='s,^[^/]*/*,,'; \
   sed_last='s,^.*/\([^/]*\)$$,\1,'; \
   sed_butlast='s,/*[^/]*$$,,'; \
   while test -n "$$dir1"; do \
     first=`echo "$$dir1" | sed -e "$$sed_first"`; \
     if test "$$first" != "."; then \
       if test "$$first" = ".."; then \
         dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
         dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
       else \
         first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
         if test "$$first2" = "$$first"; then \
           dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
         else \
           dir2="../$$dir2"; \
         fi; \
         dir0="$$dir0"/"$$first"; \
       fi; \
     fi; \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 DIST_TARGETS = dist-gzip
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = misc include lib bin modules $(am__append_1) t
 EXTRA_DIST = \
 	CREDITS \
 	HISTORY \
 	INSTALL \
 	LICENSE \
 	README \
 	RELNOTES \
 	autogen.sh \
 	misc/gendoc.pl
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
 am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
 	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@test -f $@ || rm -f stamp-h1
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in:  $(am__configure_deps) 
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
 mkpkgng: $(top_builddir)/config.status $(srcdir)/mkpkgng.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 distclean-libtool:
 	-rm -f libtool config.lt
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
 	@fail=; \
 	if $(am__make_keepgoing); then \
 	  failcom='fail=yes'; \
 	else \
 	  failcom='exit 1'; \
 	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
 	    local_target="$$target-am"; \
 	  else \
 	    local_target="$$target"; \
 	  fi; \
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-recursive
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
 	  empty_fix=.; \
 	else \
 	  include_option=--include; \
 	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-recursive
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscope: cscope.files
 	test ! -s cscope.files \
 	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
 clean-cscope:
 	-rm -f cscope.files
 cscope.files: clean-cscope cscopelist
 cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    $(am__make_dryrun) \
 	      || test -d "$(distdir)/$$subdir" \
 	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
 	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
 	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
 	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__post_remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
 	@echo WARNING: "Support for distribution archives compressed with" \
 		       "legacy program 'compress' is deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
 	@echo WARNING: "Support for shar distribution archives is" \
 	               "deprecated." >&2
 	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
 	$(am__post_remove_distdir)
 
 dist dist-all:
 	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
 	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
 # tarfile.
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
 	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build/sub \
 	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
 	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
 	        distuninstallcheck \
 	  && chmod -R a-w "$$dc_install_base" \
 	  && ({ \
 	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
 	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
 	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
 	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
 	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@test -n '$(distuninstallcheck_dir)' || { \
 	  echo 'ERROR: trying to run $@ with an empty' \
 	       '$$(distuninstallcheck_dir)' >&2; \
 	  exit 1; \
 	}; \
 	$(am__cd) '$(distuninstallcheck_dir)' || { \
 	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
 	  exit 1; \
 	}; \
 	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
 	        fi ; \
 	        $(distuninstallcheck_listfiles) ; \
 	        exit 1; } >&2
 distcleancheck: distclean
 	@if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
 	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
 	  || { echo "ERROR: files left in build directory after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
 all-am: Makefile config.h
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
 html: html-recursive
 
 html-am:
 
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-recursive
 
 install-html-am:
 
 install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
 install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
 
 pdf-am:
 
 ps: ps-recursive
 
 ps-am:
 
 uninstall-am:
 
 .MAKE: $(am__recursive_targets) all install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
 	am--refresh check check-am clean clean-cscope clean-generic \
 	clean-libtool cscope cscopelist-am ctags ctags-am dist \
 	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
 	dist-xz dist-zip distcheck distclean distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags distcleancheck \
 	distdir distuninstallcheck dvi dvi-am html html-am info \
 	info-am install install-am install-data install-data-am \
 	install-dvi install-dvi-am install-exec install-exec-am \
 	install-html install-html-am install-info install-info-am \
 	install-man install-pdf install-pdf-am install-ps \
 	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/RELNOTES
===================================================================
--- projects/clang800-import/contrib/openpam/RELNOTES	(revision 344548)
+++ projects/clang800-import/contrib/openpam/RELNOTES	(revision 344549)
@@ -1,21 +1,21 @@
 
-		 Release notes for OpenPAM Resedacea
-		 ===================================
+		  Release notes for OpenPAM Tabebuia
+		  ==================================
 
 OpenPAM is developed primarily on FreeBSD, but is expected to work on
 almost any POSIX-like platform that has GNU autotools, GNU make and
 the GNU compiler suite installed.
 
 The OpenPAM distribution consists of the following components:
 
  - The PAM library itself, with complete API documentation.
 
  - Sample modules (pam_permit, pam_deny and pam_unix) and a sample
    application (su) which demonstrate how to use the PAM library.
 
  - A test application (pamtest) which can be used to test policies and
    modules.
 
  - Unit tests for limited portions of the library.
 
 Please direct bug reports and inquiries to <des@des.no>.
Index: projects/clang800-import/contrib/openpam/aclocal.m4
===================================================================
--- projects/clang800-import/contrib/openpam/aclocal.m4	(revision 344548)
+++ projects/clang800-import/contrib/openpam/aclocal.m4	(revision 344549)
@@ -1,1186 +1,1170 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
 [m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.15'
+[am__api_version='1.16'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.16.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
 # _AM_AUTOCONF_VERSION(VERSION)
 # -----------------------------
 # aclocal traces this macro to find the Autoconf version.
 # This is a private macro too.  Using m4_define simplifies
 # the logic in aclocal, which can simply ignore this definition.
 m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.16.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
 # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
 # therefore $ac_aux_dir as well) can be either absolute or relative,
 # depending on how configure is run.  This is pretty annoying, since
 # it makes $ac_aux_dir quite unusable in subdirectories: in the top
 # source directory, any form will work fine, but in subdirectories a
 # relative path needs to be adjusted first.
 #
 # $ac_aux_dir/missing
 #    fails when called from a subdirectory if $ac_aux_dir is relative
 # $top_srcdir/$ac_aux_dir/missing
 #    fails if $ac_aux_dir is absolute,
 #    fails when called from a subdirectory in a VPATH build with
 #          a relative $ac_aux_dir
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
 # harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
 # iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
 #   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
 # and then we would define $MISSING as
 #   MISSING="\${SHELL} $am_aux_dir/missing"
 # This will work as long as MISSING is not called from configure, because
 # unfortunately $(top_srcdir) has no meaning in configure.
 # However there are other variables, like CC, which are often used in
 # configure, and could therefore not use this "fixed" $ac_aux_dir.
 #
 # Another solution, used here, is to always expand $ac_aux_dir to an
 # absolute PATH.  The drawback is that using absolute paths prevent a
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
 [AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 # Expand $ac_aux_dir to an absolute path.
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ([2.52])dnl
  m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
 _AM_SUBST_NOTMAKE([$1_FALSE])dnl
 m4_define([_AM_COND_VALUE_$1], [$2])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
 else
   $1_TRUE='#'
   $1_FALSE=
 fi
 AC_CONFIG_COMMANDS_PRE(
 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
   AC_MSG_ERROR([[conditional "$1" was never defined.
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 
 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
 
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
 # NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
 # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
 # dependency, and given that the user is not expected to run this macro,
 # just rely on AC_PROG_CC.
 AC_DEFUN([_AM_DEPENDENCIES],
 [AC_REQUIRE([AM_SET_DEPDIR])dnl
 AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
 m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
       [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
       [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
       [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
       [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
       [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                     [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
 [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named 'D' -- because '-MD' means "put the output
   # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
   # We will build objects and dependencies in a subdirectory because
   # it helps to detect inapplicable dependency modes.  For instance
   # both Tru64's cc and ICC support -MD to output dependencies as a
   # side effect of compilation, but ICC will put the dependencies in
   # the current directory while Tru64 will put them in the object
   # directory.
   mkdir sub
 
   am_cv_$1_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   fi
   am__universal=false
   m4_case([$1], [CC],
     [case " $depcc " in #(
      *\ -arch\ *\ -arch\ *) am__universal=true ;;
      esac],
     [CXX],
     [case " $depcc " in #(
      *\ -arch\ *\ -arch\ *) am__universal=true ;;
      esac])
 
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
     # we should not choose a depcomp mode which is confused by this.
     #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
       # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
       # Solaris 10 /bin/sh.
       echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle '-M -o', and we need to detect this.  Also, some Intel
     # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
     gcc)
       # This depmode causes a compiler race in universal mode.
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
       # After this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
       am__minus_obj=
       ;;
     none) break ;;
     esac
     if depmode=$depmode \
        source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
       # that says an option was ignored or not supported.
       # When given -MP, icc 7.0 and 7.1 complain thusly:
       #   icc: Command line warning: ignoring option '-M'; no argument required
       # The diagnosis changed in icc 8.0:
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_$1_dependencies_compiler_type=$depmode
         break
       fi
     fi
   done
 
   cd ..
   rm -rf conftest.dir
 else
   am_cv_$1_dependencies_compiler_type=none
 fi
 ])
 AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
 AM_CONDITIONAL([am__fastdep$1], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
 ])
 
 
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
 # This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 ])
 
 
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
 [AC_ARG_ENABLE([dependency-tracking], [dnl
 AS_HELP_STRING(
   [--enable-dependency-tracking],
   [do not reject slow dependency extractors])
 AS_HELP_STRING(
   [--disable-dependency-tracking],
   [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
   am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 AC_SUBST([am__nodep])dnl
 _AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  AS_CASE([$CONFIG_FILES],
+          [*\'*], [eval set x "$CONFIG_FILES"],
+          [*], [set x $CONFIG_FILES])
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`AS_DIRNAME("$mf")`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`AS_DIRNAME(["$file"])`
-      AS_MKDIR_P([$dirpart/$fdir])
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`AS_DIRNAME(["$am_mf"])`
+    am_filepart=`AS_BASENAME(["$am_mf"])`
+    AM_RUN_LOG([cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles]) || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).])
+  fi
+  AS_UNSET([am_dirpart])
+  AS_UNSET([am_filepart])
+  AS_UNSET([am_mf])
+  AS_UNSET([am_rc])
+  rm -f conftest-deps.mk
 }
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
 # AM_OUTPUT_DEPENDENCY_COMMANDS
 # -----------------------------
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each '.P' file that we will
-# need in order to bootstrap the dependency handling code.
+# This code is only required when automatic dependency tracking is enabled.
+# This creates each '.Po' and '.Plo' makefile fragment that we'll need in
+# order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
+     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
 dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
 m4_define([AC_PROG_CC],
 m4_defn([AC_PROG_CC])
 [_AM_PROG_CC_C_O
 ])
 
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
 # The call with PACKAGE and VERSION arguments is the old style
 # call (pre autoconf-2.50), which is being phased out.  PACKAGE
 # and VERSION should now be passed to AC_INIT and removed from
 # the call to AM_INIT_AUTOMAKE.
 # We support both call styles for the transition.  After
 # the next Automake release, Autoconf can make the AC_INIT
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
 [AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
   AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
     AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
   fi
 fi
 
 # test whether we have cygpath
 if test -z "$CYGPATH_W"; then
   if (cygpath --version) >/dev/null 2>/dev/null; then
     CYGPATH_W='cygpath -w'
   else
     CYGPATH_W=echo
   fi
 fi
 AC_SUBST([CYGPATH_W])
 
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
 [AC_DIAGNOSE([obsolete],
              [$0: two- and three-arguments forms are deprecated.])
 m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
 m4_if(
   m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
   [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
 [AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
  AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
 AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
 AM_MISSING_PROG([AUTOCONF], [autoconf])
 AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
 AM_MISSING_PROG([AUTOHEADER], [autoheader])
 AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
 		  [_AM_DEPENDENCIES([CC])],
 		  [m4_define([AC_PROG_CC],
 			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
 		  [_AM_DEPENDENCIES([CXX])],
 		  [m4_define([AC_PROG_CXX],
 			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
 		  [_AM_DEPENDENCIES([OBJC])],
 		  [m4_define([AC_PROG_OBJC],
 			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 		  [_AM_DEPENDENCIES([OBJCXX])],
 		  [m4_define([AC_PROG_OBJCXX],
 			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
 AC_REQUIRE([AM_SILENT_RULES])dnl
 dnl The testsuite driver may need to know about EXEEXT, so add the
 dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
 dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
 # recipes.  So use an aggressive probe to check that the usage we want is
 # actually supported "in the wild" to an acceptable degree.
 # See automake bug#10828.
 # To make any issue more visible, cause the running configure to be aborted
 # by default if the 'rm' program in use doesn't match our expectations; the
 # user can still override this though.
 if rm -f && rm -fr && rm -rf; then : OK; else
   cat >&2 <<'END'
 Oops!
 
 Your 'rm' program seems unable to run without file operands specified
 on the command line, even when the '-f' option is present.  This is contrary
 to the behaviour of most rm programs out there, and not conforming with
 the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
 Please tell bug-automake@gnu.org about your system, including the value
 of your $PATH and any error possibly output before this message.  This
 can help us improve future automake versions.
 
 END
   if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
     echo 'Configuration will proceed anyway, since you have set the' >&2
     echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
     echo >&2
   else
     cat >&2 <<'END'
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
 to "yes", and re-run configure.
 
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
 fi
 dnl The trailing newline in this macro's definition is deliberate, for
 dnl backward compatibility and to allow trailing 'dnl'-style comments
 dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
 
 # Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
 # loop where config.status creates the headers, so we can generate
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
 _am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
     $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
   *)
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
 [rm -rf .tst 2>/dev/null
 mkdir .tst 2>/dev/null
 if test -d .tst; then
   am__leading_dot=.
 else
   am__leading_dot=_
 fi
 rmdir .tst 2>/dev/null
 AC_SUBST([am__leading_dot])])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # AM_MAKE_INCLUDE()
 # -----------------
-# Check to see how make treats includes.
+# Check whether make has an 'include' directive that can support all
+# the idioms we need for our automatic dependency tracking code.
 AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
+[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive])
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out])
+  AS_CASE([$?:`cat confinc.out 2>/dev/null`],
+      ['0:this is the am__doit target'],
+      [AS_CASE([$s],
+          [BSD], [am__include='.include' am__quote='"'],
+          [am__include='include' am__quote=''])])
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+AC_MSG_RESULT([${_am_result}])
+AC_SUBST([am__include])])
+AC_SUBST([am__quote])])
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
 [AC_REQUIRE([AM_MISSING_HAS_RUN])
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
 # AM_MISSING_HAS_RUN
 # ------------------
 # Define MISSING if not defined so far and test if it is modern enough.
 # If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
   *)
     MISSING="\${SHELL} $am_aux_dir/missing" ;;
   esac
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
   AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
 #  -*- Autoconf -*-
 # Obsolete and "removed" macros, that must however still report explicit
 # error messages when used, to smooth transition.
 #
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([AM_CONFIG_HEADER],
 [AC_DIAGNOSE([obsolete],
 ['$0': this macro is obsolete.
 You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
 AC_CONFIG_HEADERS($@)])
 
 AC_DEFUN([AM_PROG_CC_STDC],
 [AC_PROG_CC
 am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
 AC_DIAGNOSE([obsolete],
 ['$0': this macro is obsolete.
 You should simply use the 'AC][_PROG_CC' macro instead.
 Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
 but upon 'ac_cv_prog_cc_stdc'.])])
 
 AC_DEFUN([AM_C_PROTOTYPES],
          [AC_FATAL([automatic de-ANSI-fication support has been removed])])
 AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
 # --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 # -------------------------------------------
 # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # _AM_PROG_CC_C_O
 # ---------------
 # Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
 # to automatically call this.
 AC_DEFUN([_AM_PROG_CC_C_O],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([compile])dnl
 AC_LANG_PUSH([C])dnl
 AC_CACHE_CHECK(
   [whether $CC understands -c and -o together],
   [am_cv_prog_cc_c_o],
   [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
   # Make sure it works both with $CC and with simple cc.
   # Following AC_PROG_CC_C_O, we do the test twice because some
   # compilers refuse to overwrite an existing .o file with -o,
   # though they will create one.
   am_cv_prog_cc_c_o=yes
   for am_i in 1 2; do
     if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
          && test -f conftest2.$ac_objext; then
       : OK
     else
       am_cv_prog_cc_c_o=no
       break
     fi
   done
   rm -f core conftest*
   unset am_i])
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
    # But if we don't then we get into trouble of one sort or another.
    # A longer-term fix would be to have automake use am__CC in this case,
    # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
    CC="$am_aux_dir/compile $CC"
 fi
 AC_LANG_POP([C])])
 
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # AM_RUN_LOG(COMMAND)
 # -------------------
 # Run COMMAND, save the exit status in ac_status, and log it.
 # (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
 AC_DEFUN([AM_RUN_LOG],
 [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
    ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    (exit $ac_status); }])
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *[[\\\"\#\$\&\'\`$am_lf]]*)
     AC_MSG_ERROR([unsafe absolute working directory name]);;
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
     AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
 # Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
    am_has_slept=no
    for am_try in 1 2; do
      echo "timestamp, slept: $am_has_slept" > conftest.file
      set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
      if test "$[*]" = "X"; then
 	# -L didn't work.
 	set X `ls -t "$srcdir/configure" conftest.file`
      fi
      if test "$[*]" != "X $srcdir/configure conftest.file" \
 	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
 
 	# If neither matched, then we have a broken ls.  This can happen
 	# if, for instance, CONFIG_SHELL is bash and it inherits a
 	# broken ls alias from the environment.  This has actually
 	# happened.  Such a system could not be considered "sane".
 	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
   alias in your environment])
      fi
      if test "$[2]" = conftest.file || test $am_try -eq 2; then
        break
      fi
      # Just in case.
      sleep 1
      am_has_slept=yes
    done
    test "$[2]" = conftest.file
    )
 then
    # Ok.
    :
 else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
 AC_MSG_RESULT([yes])
 # If we didn't sleep, we still need to ensure time stamps of config.status and
 # generated files are strictly newer.
 am_sleep_pid=
 if grep 'slept: no' conftest.file >/dev/null 2>&1; then
   ( sleep 1 ) &
   am_sleep_pid=$!
 fi
 AC_CONFIG_COMMANDS_PRE(
   [AC_MSG_CHECKING([that generated files are newer than configure])
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
    AC_MSG_RESULT([done])])
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
 # ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
 [AC_ARG_ENABLE([silent-rules], [dnl
 AS_HELP_STRING(
   [--enable-silent-rules],
   [less verbose build output (undo: "make V=1")])
 AS_HELP_STRING(
   [--disable-silent-rules],
   [verbose build output (undo: "make V=0")])dnl
 ])
 case $enable_silent_rules in @%:@ (((
   yes) AM_DEFAULT_VERBOSITY=0;;
    no) AM_DEFAULT_VERBOSITY=1;;
     *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 dnl
 dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
 dnl do not support nested variable expansions.
 dnl See automake bug#9928 and bug#10237.
 am_make=${MAKE-make}
 AC_CACHE_CHECK([whether $am_make supports nested variables],
    [am_cv_make_support_nested_variables],
    [if AS_ECHO([['TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
 am__doit:
 	@$(TRUE)
 .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
   am_cv_make_support_nested_variables=yes
 else
   am_cv_make_support_nested_variables=no
 fi])
 if test $am_cv_make_support_nested_variables = yes; then
   dnl Using '$V' instead of '$(V)' breaks IRIX make.
   AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
   AM_V=$AM_DEFAULT_VERBOSITY
   AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
 fi
 AC_SUBST([AM_V])dnl
 AM_SUBST_NOTMAKE([AM_V])dnl
 AC_SUBST([AM_DEFAULT_V])dnl
 AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
 AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
 AM_BACKSLASH='\'
 AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
 # always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 # Installed binaries are usually stripped using 'strip' when the user
 # run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
 # will honor the 'STRIP' environment variable to overrule this program.
 dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
 # This macro is traced by Automake.
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
 # --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
 # FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
 # $tardir.
 #     tardir=directory && $(am__tar) > result.tar
 #
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 #
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
 
 # We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
 
 m4_if([$1], [v7],
   [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
 
   [m4_case([$1],
     [ustar],
      [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
       # There is notably a 21 bits limit for the UID and the GID.  In fact,
       # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
       # and bug#13588).
       am_max_uid=2097151 # 2^21 - 1
       am_max_gid=$am_max_uid
       # The $UID and $GID variables are not portable, so we need to resort
       # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
       # below are definitely unexpected, so allow the users to see them
       # (that is, avoid stderr redirection).
       am_uid=`id -u || echo unknown`
       am_gid=`id -g || echo unknown`
       AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
       if test $am_uid -le $am_max_uid; then
          AC_MSG_RESULT([yes])
       else
          AC_MSG_RESULT([no])
          _am_tools=none
       fi
       AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
       if test $am_gid -le $am_max_gid; then
          AC_MSG_RESULT([yes])
       else
         AC_MSG_RESULT([no])
         _am_tools=none
       fi],
 
   [pax],
     [],
 
   [m4_fatal([Unknown tar format])])
 
   AC_MSG_CHECKING([how to create a $1 tar archive])
 
   # Go ahead even if we have the value already cached.  We do so because we
   # need to set the values for the 'am__tar' and 'am__untar' variables.
   _am_tools=${am_cv_prog_tar_$1-$_am_tools}
 
   for _am_tool in $_am_tools; do
     case $_am_tool in
     gnutar)
       for _am_tar in tar gnutar gtar; do
         AM_RUN_LOG([$_am_tar --version]) && break
       done
       am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
       am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
       am__untar="$_am_tar -xf -"
       ;;
     plaintar)
       # Must skip GNU tar: if it does not support --format= it doesn't create
       # ustar tarball either.
       (tar --version) >/dev/null 2>&1 && continue
       am__tar='tar chf - "$$tardir"'
       am__tar_='tar chf - "$tardir"'
       am__untar='tar xf -'
       ;;
     pax)
       am__tar='pax -L -x $1 -w "$$tardir"'
       am__tar_='pax -L -x $1 -w "$tardir"'
       am__untar='pax -r'
       ;;
     cpio)
       am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
       am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
       am__untar='cpio -i -H $1 -d'
       ;;
     none)
       am__tar=false
       am__tar_=false
       am__untar=false
       ;;
     esac
 
     # If the value was cached, stop now.  We just wanted to have am__tar
     # and am__untar set.
     test -n "${am_cv_prog_tar_$1}" && break
 
     # tar/untar a dummy directory, and stop if the command works.
     rm -rf conftest.dir
     mkdir conftest.dir
     echo GrepMe > conftest.dir/file
     AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
     rm -rf conftest.dir
     if test -s conftest.tar; then
       AM_RUN_LOG([$am__untar <conftest.tar])
       AM_RUN_LOG([cat conftest.dir/file])
       grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
     fi
   done
   rm -rf conftest.dir
 
   AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
   AC_MSG_RESULT([$am_cv_prog_tar_$1])])
 
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/ax_pkg_config.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])
 m4_include([m4/ltsugar.m4])
 m4_include([m4/ltversion.m4])
 m4_include([m4/lt~obsolete.m4])
Index: projects/clang800-import/contrib/openpam/bin/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/bin/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/bin/Makefile.in	(revision 344549)
@@ -1,626 +1,633 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @WITH_PAMTEST_TRUE@am__append_1 = pamtest
 @WITH_SU_TRUE@am__append_2 = su
 subdir = bin
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
 	install-exec-recursive install-html-recursive \
 	install-info-recursive install-pdf-recursive \
 	install-ps-recursive install-recursive installcheck-recursive \
 	installdirs-recursive pdf-recursive ps-recursive \
 	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
   $(RECURSIVE_TARGETS) \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = openpam_dump_policy pamtest su
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
   sed_rest='s,^[^/]*/*,,'; \
   sed_last='s,^.*/\([^/]*\)$$,\1,'; \
   sed_butlast='s,/*[^/]*$$,,'; \
   while test -n "$$dir1"; do \
     first=`echo "$$dir1" | sed -e "$$sed_first"`; \
     if test "$$first" != "."; then \
       if test "$$first" = ".."; then \
         dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
         dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
       else \
         first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
         if test "$$first2" = "$$first"; then \
           dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
         else \
           dir2="../$$dir2"; \
         fi; \
         dir0="$$dir0"/"$$first"; \
       fi; \
     fi; \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = openpam_dump_policy $(am__append_1) $(am__append_2)
 all: all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign bin/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
 	@fail=; \
 	if $(am__make_keepgoing); then \
 	  failcom='fail=yes'; \
 	else \
 	  failcom='exit 1'; \
 	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
 	    local_target="$$target-am"; \
 	  else \
 	    local_target="$$target"; \
 	  fi; \
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-recursive
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
 	  empty_fix=.; \
 	else \
 	  include_option=--include; \
 	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-recursive
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    $(am__make_dryrun) \
 	      || test -d "$(distdir)/$$subdir" \
 	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
 	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
 	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
 	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-recursive
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
 html: html-recursive
 
 html-am:
 
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-recursive
 
 install-html-am:
 
 install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
 install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
 
 pdf-am:
 
 ps: ps-recursive
 
 ps-am:
 
 uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic clean-libtool cscopelist-am ctags \
 	ctags-am distclean distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/bin/openpam_dump_policy/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/bin/openpam_dump_policy/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/bin/openpam_dump_policy/Makefile.in	(revision 344549)
@@ -1,596 +1,610 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 noinst_PROGRAMS = openpam_dump_policy$(EXEEXT)
 subdir = bin/openpam_dump_policy
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_openpam_dump_policy_OBJECTS = openpam_dump_policy.$(OBJEXT)
 openpam_dump_policy_OBJECTS = $(am_openpam_dump_policy_OBJECTS)
 am__DEPENDENCIES_1 =
 @WITH_SYSTEM_LIBPAM_FALSE@openpam_dump_policy_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@openpam_dump_policy_DEPENDENCIES =  \
 @WITH_SYSTEM_LIBPAM_TRUE@	$(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/openpam_dump_policy.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(openpam_dump_policy_SOURCES)
 DIST_SOURCES = $(openpam_dump_policy_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
 openpam_dump_policy_SOURCES = openpam_dump_policy.c
 @WITH_SYSTEM_LIBPAM_FALSE@openpam_dump_policy_LDADD = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@openpam_dump_policy_LDADD = $(SYSTEM_LIBPAM)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/openpam_dump_policy/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign bin/openpam_dump_policy/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
 
 openpam_dump_policy$(EXEEXT): $(openpam_dump_policy_OBJECTS) $(openpam_dump_policy_DEPENDENCIES) $(EXTRA_openpam_dump_policy_DEPENDENCIES) 
 	@rm -f openpam_dump_policy$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(openpam_dump_policy_OBJECTS) $(openpam_dump_policy_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dump_policy.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dump_policy.Po@am__quote@ # am--include-marker
 
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS)
 installdirs:
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/openpam_dump_policy.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/openpam_dump_policy.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am:
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-man install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/bin/pamtest/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/bin/pamtest/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/bin/pamtest/Makefile.in	(revision 344549)
@@ -1,714 +1,728 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = pamtest$(EXEEXT)
 subdir = bin/pamtest
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_pamtest_OBJECTS = pamtest.$(OBJEXT)
 pamtest_OBJECTS = $(am_pamtest_OBJECTS)
 am__DEPENDENCIES_1 =
 @WITH_SYSTEM_LIBPAM_FALSE@pamtest_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@pamtest_DEPENDENCIES = $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pamtest.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(pamtest_SOURCES)
 DIST_SOURCES = $(pamtest_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man1_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 pamtest_SOURCES = pamtest.c
 @WITH_SYSTEM_LIBPAM_FALSE@pamtest_LDADD = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@pamtest_LDADD = $(SYSTEM_LIBPAM)
 dist_man1_MANS = pamtest.1
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/pamtest/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign bin/pamtest/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p \
 	 || test -f $$p1 \
 	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
 	sed -e 'p;s,.*/,,;n;h' \
 	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
 	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
 	    else { print "f", $$3 "/" $$4, $$1; } } \
 	  END { for (d in files) print "f", d, files[d] }' | \
 	while read type dir files; do \
 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	    test -z "$$files" || { \
 	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
 	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 	    } \
 	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' \
 	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
 
 pamtest$(EXEEXT): $(pamtest_OBJECTS) $(pamtest_DEPENDENCIES) $(EXTRA_pamtest_DEPENDENCIES) 
 	@rm -f pamtest$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(pamtest_OBJECTS) $(pamtest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pamtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pamtest.Po@am__quote@ # am--include-marker
 
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(dist_man1_MANS)
 	@$(NORMAL_INSTALL)
 	@list1='$(dist_man1_MANS)'; \
 	list2=''; \
 	test -n "$(man1dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
 	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 	{ for i in $$list1; do echo "$$i"; done;  \
 	if test -n "$$list2"; then \
 	  for i in $$list2; do echo "$$i"; done \
 	    | sed -n '/\.1[a-z]*$$/p'; \
 	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
 	done | \
 	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
 	sed 'N;N;s,\n, ,g' | { \
 	list=; while read file base inst; do \
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
 	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
 	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
 	  fi; \
 	done; \
 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 	while read files; do \
 	  test -z "$$files" || { \
 	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
 	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
 	done; }
 
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pamtest.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am: install-man
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am: install-binPROGRAMS
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man: install-man1
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pamtest.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-man
 
 uninstall-man: uninstall-man1
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
 	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
 	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
 	install-data install-data-am install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-man1 \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-man uninstall-man1
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/bin/pamtest/pamtest.1
===================================================================
--- projects/clang800-import/contrib/openpam/bin/pamtest/pamtest.1	(revision 344548)
+++ projects/clang800-import/contrib/openpam/bin/pamtest/pamtest.1	(revision 344549)
@@ -1,189 +1,189 @@
 .\"-
 .\" Copyright (c) 2011-2017 Dag-Erling Smørgrav
 .\" 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. The name of the author may not be used to endorse or promote
 .\"    products derived from this software without specific prior written
 .\"    permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
 .\"
-.\" $OpenPAM: pamtest.1 939 2017-04-30 21:36:50Z des $
+.\" $OpenPAM: pamtest.1 947 2019-02-24 20:18:17Z des $
 .\"
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAMTEST 1
 .Os
 .Sh NAME
 .Nm pamtest
 .Nd PAM policy tester
 .Sh SYNOPSIS
 .Nm
 .Op Fl dkMPsv
 .Op Fl H Ar rhost
 .Op Fl h Ar host
 .Op Fl T Ar timeout
 .Op Fl t Ar tty
 .Op Fl U Ar ruser
 .Op Fl u Ar user
 .Ar service
 .Op Ar command ...
 .Sh DESCRIPTION
 The
 .Nm
 utility offers an easy way to test PAM modules and policies from the
 command line.
 .Pp
 The
 .Nm
 utility loads the PAM policy specified by the
 .Ar service
 argument, starts a PAM transaction by calling
 .Xr pam_start 3 ,
 then executes the primitives specified by the remaining command-line
 arguments.
 Finally, it ends the transaction by calling
 .Xr pam_end 3 .
 .Pp
 The commands are:
 .Bl -tag -width 6n
 .It Cm authenticate , Cm auth
 Call
 .Xr pam_authenticate 3 .
 .It Cm acct_mgmt , Cm account
 Call
 .Xr pam_acct_mgmt 3 .
 .It Cm chauthtok , Cm change
 Call
 .Xr pam_chauthtok 3
 with the
 .Dv PAM_CHANGE_EXPIRED_AUTHTOK
 flag set.
 .It Cm forcechauthtok , Cm forcechange
 Call
 .Xr pam_chauthtok 3
 with no flags set.
 .It Cm setcred , Cm establish_cred
 Call
 .Xr pam_setcred 3
 with the
 .Dv PAM_ESTABLISH_CRED
 flag set.
 .It Cm open_session , Cm open
 Call
 .Xr pam_open_session 3 .
 .It Cm close_session , Cm close
 Call
 .Xr pam_close_session 3 .
 .It Cm unsetcred , Cm delete_cred
 Call
 .Xr pam_setcred 3
 with the
 .Dv PAM_DELETE_CRED
 flag set.
 .It Cm listenv , Cm env
 Call
 .Xr pam_getenvlist 3
 and print the contents of the list it returns.
 .El
 .Pp
 The following options are available:
 .Bl -tag -width Fl
 .It Fl d
 Enables debug messages within the OpenPAM library.
 See
 .Xr openpam_log 3
 for details.
 .It Fl H Ar rhost
 Specify the name of the fictitious remote host.
 The default is to use the name of the local host.
 .It Fl h Ar host
 Specify the name of the local host.
 The default is to use the result of calling
 .Xr gethostname 3 .
 .It Fl k
 Keep going even if one of the commands fails.
 .It Fl M
 Disable path, ownership and permission checks on module files.
 .It Fl P
 Disable service name validation and path, ownership and permission
 checks on policy files.
 .It Fl s
 Set the
 .Dv PAM_SILENT
 flag when calling the
 .Xr pam_authenticate 3 ,
 .Xr pam_acct_mgmt 3 ,
 .Xr pam_chauthok 3 ,
 .Xr pam_setcred 3 ,
 .Xr pam_open_session 3
 and
 .Xr pam_close_session 3
 primitives.
 .It Fl T Ar timeout
 Set the conversation timeout (in seconds) for
 .Xr openpam_ttyconv 3 .
 .It Fl t Ar tty
 Specify the name of the tty.
 The default is to use the result of calling
 .Xr ttyname 3 .
 .It Fl U Ar ruser
 Specify the name of the supplicant (remote user).
 .It Fl u Ar user
 Specify the name of the principal (local user).
 .It Fl v
 Enables debug messages from
 .Nm
 itself.
 .El
 .Sh EXAMPLES
 Simulate a typical PAM transaction using the
 .Dq system
 policy:
 .Bd -literal -offset indent
 pamtest -v system auth account change setcred open close unsetcred
 .Ed
 .Sh SEE ALSO
 .Xr openpam 3 ,
 .Xr pam 3 ,
 .Xr pam.conf 5
 .Sh AUTHORS
 The
 .Nm
 utility and this manual page were written by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
 .Sh BUGS
 The
 .Nm
 utility does not (yet) support setting and getting individual PAM
 items or environment variables.
 .Pp
 The
 .Nm
 utility does not afford the user complete control over the flags
 passed to the
 .Xr pam_authenticate 3 ,
 .Xr pam_acct_mgmt 3 ,
 .Xr pam_chauthok 3 ,
 .Xr pam_setcred 3 ,
 .Xr pam_open_session 3
 and
 .Xr pam_close_session 3
 primitives.
Index: projects/clang800-import/contrib/openpam/bin/su/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/bin/su/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/bin/su/Makefile.in	(revision 344549)
@@ -1,714 +1,728 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = su$(EXEEXT)
 subdir = bin/su
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS)
 am_su_OBJECTS = su.$(OBJEXT)
 su_OBJECTS = $(am_su_OBJECTS)
 am__DEPENDENCIES_1 =
 @WITH_SYSTEM_LIBPAM_FALSE@su_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@su_DEPENDENCIES = $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/su.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(su_SOURCES)
 DIST_SOURCES = $(su_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(dist_man1_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \
 	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CPPFLAGS = -I$(top_srcdir)/include
 su_SOURCES = su.c
 @WITH_SYSTEM_LIBPAM_FALSE@su_LDADD = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@su_LDADD = $(SYSTEM_LIBPAM)
 dist_man1_MANS = su.1
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/su/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign bin/su/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p \
 	 || test -f $$p1 \
 	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
 	sed -e 'p;s,.*/,,;n;h' \
 	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
 	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
 	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
 	    else { print "f", $$3 "/" $$4, $$1; } } \
 	  END { for (d in files) print "f", d, files[d] }' | \
 	while read type dir files; do \
 	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
 	    test -z "$$files" || { \
 	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
 	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
 	    } \
 	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
 	      -e 's/$$/$(EXEEXT)/' \
 	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
 
 su$(EXEEXT): $(su_OBJECTS) $(su_DEPENDENCIES) $(EXTRA_su_DEPENDENCIES) 
 	@rm -f su$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(su_OBJECTS) $(su_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/su.Po@am__quote@ # am--include-marker
 
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 install-man1: $(dist_man1_MANS)
 	@$(NORMAL_INSTALL)
 	@list1='$(dist_man1_MANS)'; \
 	list2=''; \
 	test -n "$(man1dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
 	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
 	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
 	{ for i in $$list1; do echo "$$i"; done;  \
 	if test -n "$$list2"; then \
 	  for i in $$list2; do echo "$$i"; done \
 	    | sed -n '/\.1[a-z]*$$/p'; \
 	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
 	done | \
 	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
 	sed 'N;N;s,\n, ,g' | { \
 	list=; while read file base inst; do \
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
 	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
 	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
 	  fi; \
 	done; \
 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 	while read files; do \
 	  test -z "$$files" || { \
 	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
 	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
 	done; }
 
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(MANS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/su.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am: install-man
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am: install-binPROGRAMS
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man: install-man1
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/su.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-man
 
 uninstall-man: uninstall-man1
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
 	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
 	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
 	install-data install-data-am install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-man1 \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-binPROGRAMS uninstall-man uninstall-man1
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/bin/su/su.1
===================================================================
--- projects/clang800-import/contrib/openpam/bin/su/su.1	(revision 344548)
+++ projects/clang800-import/contrib/openpam/bin/su/su.1	(revision 344549)
@@ -1,65 +1,65 @@
 .\"-
 .\" Copyright (c) 2011-2017 Dag-Erling Smørgrav
 .\" 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. The name of the author may not be used to endorse or promote
 .\"    products derived from this software without specific prior written
 .\"    permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
 .\"
-.\" $OpenPAM: su.1 939 2017-04-30 21:36:50Z des $
+.\" $OpenPAM: su.1 947 2019-02-24 20:18:17Z des $
 .\"
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt SU 1
 .Os
 .Sh NAME
 .Nm su
 .Nd switch user identity
 .Sh SYNOPSIS
 .Nm
 .Op Ar login Op Ar ...
 .Sh DESCRIPTION
 The
 .Nm
 utility starts a shell under the identity of the user specified by the
 first argument on the command line.
 If no user is specified, the default is
 .Dq root .
 .Pp
 Any additional command-line arguments are passed as-is to the shell.
 .Pp
 The requesting user is authenticated using the
 .Dq su
 PAM policy.
 .Sh IMPLEMENTATION NOTES
 The
 .Nm
 utility is provided with the OpenPAM library as a sample application
 and should not be used in production systems.
 .Sh SEE ALSO
 .Xr openpam 3 ,
 .Xr pam 3
 .Sh AUTHORS
 The
 .Nm
 utility and this manual page were written by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/compile
===================================================================
--- projects/clang800-import/contrib/openpam/compile	(revision 344548)
+++ projects/clang800-import/contrib/openpam/compile	(revision 344549)
@@ -1,347 +1,348 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
 # This file is maintained in Automake, please report
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
 nl='
 '
 
 # We need space, tab and new line, in precisely that order.  Quoting is
 # there to prevent tools from complaining about whitespace usage.
 IFS=" ""	$nl"
 
 file_conv=
 
 # func_file_conv build_file lazy
 # Convert a $build file to $host form and store it in $file
 # Currently only supports Windows hosts. If the determined conversion
 # type is listed in (the comma separated) LAZY, no conversion will
 # take place.
 func_file_conv ()
 {
   file=$1
   case $file in
     / | /[!/]*) # absolute file, and not a UNC file
       if test -z "$file_conv"; then
 	# lazily determine how to convert abs files
 	case `uname -s` in
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
 	  CYGWIN*)
 	    file_conv=cygwin
 	    ;;
 	  *)
 	    file_conv=wine
 	    ;;
 	esac
       fi
       case $file_conv/,$2, in
 	*,$file_conv,*)
 	  ;;
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
 	cygwin/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
 	  file=`winepath -w "$file" || echo "$file"`
 	  ;;
       esac
       ;;
   esac
 }
 
 # func_cl_dashL linkdir
 # Make cl look for libraries in LINKDIR
 func_cl_dashL ()
 {
   func_file_conv "$1"
   if test -z "$lib_path"; then
     lib_path=$file
   else
     lib_path="$lib_path;$file"
   fi
   linker_opts="$linker_opts -LIBPATH:$file"
 }
 
 # func_cl_dashl library
 # Do a library search-path lookup for cl
 func_cl_dashl ()
 {
   lib=$1
   found=no
   save_IFS=$IFS
   IFS=';'
   for dir in $lib_path $LIB
   do
     IFS=$save_IFS
     if $shared && test -f "$dir/$lib.dll.lib"; then
       found=yes
       lib=$dir/$lib.dll.lib
       break
     fi
     if test -f "$dir/$lib.lib"; then
       found=yes
       lib=$dir/$lib.lib
       break
     fi
     if test -f "$dir/lib$lib.a"; then
       found=yes
       lib=$dir/lib$lib.a
       break
     fi
   done
   IFS=$save_IFS
 
   if test "$found" != yes; then
     lib=$lib.lib
   fi
 }
 
 # func_cl_wrapper cl arg...
 # Adjust compile command to suit cl
 func_cl_wrapper ()
 {
   # Assume a capable shell
   lib_path=
   shared=:
   linker_opts=
   for arg
   do
     if test -n "$eat"; then
       eat=
     else
       case $1 in
 	-o)
 	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
 	  eat=1
 	  case $2 in
 	    *.o | *.[oO][bB][jJ])
 	      func_file_conv "$2"
 	      set x "$@" -Fo"$file"
 	      shift
 	      ;;
 	    *)
 	      func_file_conv "$2"
 	      set x "$@" -Fe"$file"
 	      shift
 	      ;;
 	  esac
 	  ;;
 	-I)
 	  eat=1
 	  func_file_conv "$2" mingw
 	  set x "$@" -I"$file"
 	  shift
 	  ;;
 	-I*)
 	  func_file_conv "${1#-I}" mingw
 	  set x "$@" -I"$file"
 	  shift
 	  ;;
 	-l)
 	  eat=1
 	  func_cl_dashl "$2"
 	  set x "$@" "$lib"
 	  shift
 	  ;;
 	-l*)
 	  func_cl_dashl "${1#-l}"
 	  set x "$@" "$lib"
 	  shift
 	  ;;
 	-L)
 	  eat=1
 	  func_cl_dashL "$2"
 	  ;;
 	-L*)
 	  func_cl_dashL "${1#-L}"
 	  ;;
 	-static)
 	  shared=false
 	  ;;
 	-Wl,*)
 	  arg=${1#-Wl,}
 	  save_ifs="$IFS"; IFS=','
 	  for flag in $arg; do
 	    IFS="$save_ifs"
 	    linker_opts="$linker_opts $flag"
 	  done
 	  IFS="$save_ifs"
 	  ;;
 	-Xlinker)
 	  eat=1
 	  linker_opts="$linker_opts $2"
 	  ;;
 	-*)
 	  set x "$@" "$1"
 	  shift
 	  ;;
 	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
 	  func_file_conv "$1"
 	  set x "$@" -Tp"$file"
 	  shift
 	  ;;
 	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
 	  func_file_conv "$1" mingw
 	  set x "$@" "$file"
 	  shift
 	  ;;
 	*)
 	  set x "$@" "$1"
 	  shift
 	  ;;
       esac
     fi
     shift
   done
   if test -n "$linker_opts"; then
     linker_opts="-link$linker_opts"
   fi
   exec "$@" $linker_opts
   exit 1
 }
 
 eat=
 
 case $1 in
   '')
      echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 
 Wrapper for compilers which do not understand '-c -o'.
 Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
 right script to run: please start by reading the file 'INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
     exit $?
     ;;
   -v | --v*)
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
 
 ofile=
 cfile=
 
 for arg
 do
   if test -n "$eat"; then
     eat=
   else
     case $1 in
       -o)
 	# configure might choose to run compile as 'compile cc -o foo foo.c'.
 	# So we strip '-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
 	    ofile=$2
 	    ;;
 	  *)
 	    set x "$@" -o "$2"
 	    shift
 	    ;;
 	esac
 	;;
       *.c)
 	cfile=$1
 	set x "$@" "$1"
 	shift
 	;;
       *)
 	set x "$@" "$1"
 	shift
 	;;
     esac
   fi
   shift
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
   # If no '-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
   # '.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
 
 # Name of file we expect compiler to create.
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
 # Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
 while true; do
   if mkdir "$lockdir" >/dev/null 2>&1; then
     break
   fi
   sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
 trap "rmdir '$lockdir'; exit 1" 1 2 15
 
 # Run the compile.
 "$@"
 ret=$?
 
 if test -f "$cofile"; then
   test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
   test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"
 exit $ret
 
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
Index: projects/clang800-import/contrib/openpam/config.h.in
===================================================================
--- projects/clang800-import/contrib/openpam/config.h.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/config.h.in	(revision 344549)
@@ -1,171 +1,168 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Whether loading unversioned modules support is disabled */
 #undef DISABLE_UNVERSIONED_MODULES
 
 /* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
+/* Define to 1 if you have cryb-test */
+#undef HAVE_CRYB_TEST
+
 /* Define to 1 if you have the <crypt.h> header file. */
 #undef HAVE_CRYPT_H
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
 /* Define to 1 if you have the `dlfunc' function. */
 #undef HAVE_DLFUNC
 
 /* Define to 1 if you have the `fdlopen' function. */
 #undef HAVE_FDLOPEN
 
 /* Define to 1 if you have the `fpurge' function. */
 #undef HAVE_FPURGE
 
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `crypt' library (-lcrypt). */
-#undef HAVE_LIBCRYPT
-
-/* Define to 1 if you have the `crypto' library (-lcrypto). */
-#undef HAVE_LIBCRYPTO
 
 /* Define to 1 if you have the `dl' library (-ldl). */
 #undef HAVE_LIBDL
 
 /* Define to 1 if you have the `pam' library (-lpam). */
 #undef HAVE_LIBPAM
 
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
 /* Define to 1 if you have the `setlogmask' function. */
 #undef HAVE_SETLOGMASK
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
 /* Define to 1 if you have the `strlcat' function. */
 #undef HAVE_STRLCAT
 
 /* Define to 1 if you have the `strlcmp' function. */
 #undef HAVE_STRLCMP
 
 /* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 
 /* Define to 1 if you have the `strlset' function. */
 #undef HAVE_STRLSET
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
 /* Define to 1 if you have the `vasprintf' function. */
 #undef HAVE_VASPRINTF
 
 /* OpenPAM library major number */
 #undef LIB_MAJ
 
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Turn debugging macros on */
 #undef OPENPAM_DEBUG
 
 /* OpenPAM modules directory */
 #undef OPENPAM_MODULES_DIR
 
 /* Name of package */
 #undef PACKAGE
 
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
 /* Define to the full name of this package. */
 #undef PACKAGE_NAME
 
 /* Define to the full name and version of this package. */
 #undef PACKAGE_STRING
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
 /* Define to the home page for this package. */
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
 /* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
 /* Enable general extensions on Solaris.  */
 #ifndef __EXTENSIONS__
 # undef __EXTENSIONS__
 #endif
 
 
 /* Version number of package */
 #undef VERSION
 
 /* Define to 1 if on MINIX. */
 #undef _MINIX
 
 /* Define to 2 if the system does not provide POSIX.1 features except with
    this defined. */
 #undef _POSIX_1_SOURCE
 
 /* Define to 1 if you need to in order for `stat' and other things to work. */
 #undef _POSIX_SOURCE
 
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
 /* Define to the equivalent of the C99 'restrict' keyword, or to
    nothing if this is not supported.  Do not define if restrict is
    supported directly.  */
 #undef restrict
 /* Work around a bug in Sun C++: it does not support _Restrict or
    __restrict__, even though the corresponding Sun C compiler ends up with
    "#define restrict _Restrict" or "#define restrict __restrict__" in the
    previous line.  Perhaps some future version of Sun C++ will work with
    restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
 #if defined __SUNPRO_CC && !defined __RESTRICT
 # define _Restrict
 # define __restrict__
 #endif
 
 /* Define to empty if the keyword `volatile' does not work. Warning: valid
    code using `volatile' can become incorrect without. Disable with care. */
 #undef volatile
Index: projects/clang800-import/contrib/openpam/config.sub
===================================================================
--- projects/clang800-import/contrib/openpam/config.sub	(revision 344548)
+++ projects/clang800-import/contrib/openpam/config.sub	(revision 344549)
@@ -1,1804 +1,1804 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright 1992-2015 Free Software Foundation, Inc.
 
 timestamp='2015-03-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
 # Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
 # Each package is responsible for reporting which valid configurations
 # it does not support.  The user should be able to distinguish
 # a failure to support a valid configuration from a meaningless
 # configuration.
 
 # The goal of this file is to map all the various variations of a given
 # machine specification into a single specification in the form:
 #	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
 # or in some cases, the newer four-part form:
 #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
 # It is wrong to echo any other type of specification.
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
 Usage: $0 [OPTION] CPU-MFR-OPSYS
        $0 [OPTION] ALIAS
 
 Canonicalize a configuration name.
 
 Operation modes:
   -h, --help         print this help, then exit
   -t, --time-stamp   print date of last modification, then exit
   -v, --version      print version number, then exit
 
 Report bugs and patches to <config-patches@gnu.org>."
 
 version="\
 GNU config.sub ($timestamp)
 
 Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 
 help="
 Try \`$me --help' for more information."
 
 # Parse command line
 while test $# -gt 0 ; do
   case $1 in
     --time-stamp | --time* | -t )
        echo "$timestamp" ; exit ;;
     --version | -v )
        echo "$version" ; exit ;;
     --help | --h* | -h )
        echo "$usage"; exit ;;
     -- )     # Stop option processing
        shift; break ;;
     - )	# Use stdin as input.
        break ;;
     -* )
        echo "$me: invalid option $1$help"
        exit 1 ;;
 
     *local*)
        # First pass through any local machine types.
        echo $1
        exit ;;
 
     * )
        break ;;
   esac
 done
 
 case $# in
  0) echo "$me: missing argument$help" >&2
     exit 1;;
  1) ;;
  *) echo "$me: too many arguments$help" >&2
     exit 1;;
 esac
 
 # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
   android-linux)
     os=-linux-android
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
     ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
     then os=`echo $1 | sed 's/.*-/-/'`
     else os=; fi
     ;;
 esac
 
 ### Let's recognize common machines as not being operating systems so
 ### that things like config.sub decstation-3100 work.  We also
 ### recognize some manufacturers as not being operating systems, so we
 ### can provide default operating systems below.
 case $os in
 	-sun*os*)
 		# Prevent following clause from handling this invalid input.
 		;;
 	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
 	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
 	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
 	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
 	-bluegene*)
 		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
 		;;
 	-scout)
 		;;
 	-wrs)
 		os=-vxworks
 		basic_machine=$1
 		;;
 	-chorusos*)
 		os=-chorusos
 		basic_machine=$1
 		;;
 	-chorusrdb)
 		os=-chorusrdb
 		basic_machine=$1
 		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
 	-sco6)
 		os=-sco5v6
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5)
 		os=-sco3.2v5
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco4)
 		os=-sco3.2v4
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2.[4-9]*)
 		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco3.2v[4-9]*)
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco5v6*)
 		# Don't forget version if it is 3.2v4 or newer.
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-sco*)
 		os=-sco3.2v2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-udk*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-isc)
 		os=-isc2.2
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-clix*)
 		basic_machine=clipper-intergraph
 		;;
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
 	-lynx*178)
 		os=-lynxos178
 		;;
 	-lynx*5)
 		os=-lynxos5
 		;;
 	-lynx*)
 		os=-lynxos
 		;;
 	-ptx*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
 		;;
 	-windowsnt*)
 		os=`echo $os | sed -e 's/windowsnt/winnt/'`
 		;;
 	-psos*)
 		os=-psos
 		;;
 	-mint | -mint[0-9]*)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
 	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| e2k | epiphany \
 	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
 	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
 	| mips64r5900 | mips64r5900el \
 	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	c54x)
 		basic_machine=tic54x-unknown
 		;;
 	c55x)
 		basic_machine=tic55x-unknown
 		;;
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
 	leon|leon[3-9])
 		basic_machine=sparc-$basic_machine
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
 		;;
 	ms1)
 		basic_machine=mt-unknown
 		;;
 
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
 	xgate)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
 
 	xscaleel)
 		basic_machine=armel-unknown
 		;;
 
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
 	i*86 | x86_64)
 	  basic_machine=$basic_machine-pc
 	  ;;
 	# Object if more than one company name word.
 	*-*-*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | amd64-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
 	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
 	| mips64r5900-* | mips64r5900el-* \
 	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
 	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | powerpcspe-* \
 	| pyramid-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
 	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
 		basic_machine=$basic_machine-unknown
 		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
 		basic_machine=i386-unknown
 		os=-bsd
 		;;
 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
 		basic_machine=m68000-att
 		;;
 	3b*)
 		basic_machine=we32k-att
 		;;
 	a29khif)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
 	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
 		basic_machine=m68010-adobe
 		os=-scout
 		;;
 	alliant | fx80)
 		basic_machine=fx80-alliant
 		;;
 	altos | altos3068)
 		basic_machine=m68k-altos
 		;;
 	am29k)
 		basic_machine=a29k-none
 		os=-bsd
 		;;
 	amdahl)
 		basic_machine=580-amdahl
 		os=-sysv
 		;;
 	amiga | amiga-*)
 		basic_machine=m68k-unknown
 		;;
 	amigaos | amigados)
 		basic_machine=m68k-unknown
 		os=-amigaos
 		;;
 	amigaunix | amix)
 		basic_machine=m68k-unknown
 		os=-sysv4
 		;;
 	apollo68)
 		basic_machine=m68k-apollo
 		os=-sysv
 		;;
 	apollo68bsd)
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
 	aros)
 		basic_machine=i386-pc
 		os=-aros
 		;;
         asmjs)
 		basic_machine=asmjs-unknown
 		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
 		;;
 	balance)
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
 	blackfin)
 		basic_machine=bfin-unknown
 		os=-linux
 		;;
 	blackfin-*)
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
 	c54x-*)
 		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	c55x-*)
 		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	c6x-*)
 		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
 	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
 		;;
 	convex-c2)
 		basic_machine=c2-convex
 		os=-bsd
 		;;
 	convex-c32)
 		basic_machine=c32-convex
 		os=-bsd
 		;;
 	convex-c34)
 		basic_machine=c34-convex
 		os=-bsd
 		;;
 	convex-c38)
 		basic_machine=c38-convex
 		os=-bsd
 		;;
 	cray | j90)
 		basic_machine=j90-cray
 		os=-unicos
 		;;
 	craynv)
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
 	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
 	crds | unos)
 		basic_machine=m68k-crds
 		;;
 	crisv32 | crisv32-* | etraxfs*)
 		basic_machine=crisv32-axis
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=cris-axis
 		;;
 	crx)
 		basic_machine=crx-unknown
 		os=-elf
 		;;
 	da30 | da30-*)
 		basic_machine=m68k-da30
 		;;
 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
 		basic_machine=mips-dec
 		;;
 	decsystem10* | dec10*)
 		basic_machine=pdp10-dec
 		os=-tops10
 		;;
 	decsystem20* | dec20*)
 		basic_machine=pdp10-dec
 		os=-tops20
 		;;
 	delta | 3300 | motorola-3300 | motorola-delta \
 	      | 3300-motorola | delta-motorola)
 		basic_machine=m68k-motorola
 		;;
 	delta88)
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
 	dicos)
 		basic_machine=i686-pc
 		os=-dicos
 		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
 		;;
 	dpx20 | dpx20-*)
 		basic_machine=rs6000-bull
 		os=-bosx
 		;;
 	dpx2* | dpx2*-bull)
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
 		;;
 	elxsi)
 		basic_machine=elxsi-elxsi
 		os=-bsd
 		;;
 	encore | umax | mmax)
 		basic_machine=ns32k-encore
 		;;
 	es1800 | OSE68k | ose68k | ose | OSE)
 		basic_machine=m68k-ericsson
 		os=-ose
 		;;
 	fx2800)
 		basic_machine=i860-alliant
 		;;
 	genix)
 		basic_machine=ns32k-ns
 		;;
 	gmicro)
 		basic_machine=tron-gmicro
 		os=-sysv
 		;;
 	go32)
 		basic_machine=i386-pc
 		os=-go32
 		;;
 	h3050r* | hiux*)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
 		;;
 	h8300hms)
 		basic_machine=h8300-hitachi
 		os=-hms
 		;;
 	h8300xray)
 		basic_machine=h8300-hitachi
 		os=-xray
 		;;
 	h8500hms)
 		basic_machine=h8500-hitachi
 		os=-hms
 		;;
 	harris)
 		basic_machine=m88k-harris
 		os=-sysv3
 		;;
 	hp300-*)
 		basic_machine=m68k-hp
 		;;
 	hp300bsd)
 		basic_machine=m68k-hp
 		os=-bsd
 		;;
 	hp300hpux)
 		basic_machine=m68k-hp
 		os=-hpux
 		;;
 	hp3k9[0-9][0-9] | hp9[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
 	hp9k2[0-9][0-9] | hp9k31[0-9])
 		basic_machine=m68000-hp
 		;;
 	hp9k3[2-9][0-9])
 		basic_machine=m68k-hp
 		;;
 	hp9k6[0-9][0-9] | hp6[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
 	hp9k7[0-79][0-9] | hp7[0-79][0-9])
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k78[0-9] | hp78[0-9])
 		# FIXME: really hppa2.0-hp
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
 		# FIXME: really hppa2.0-hp
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][13679] | hp8[0-9][13679])
 		basic_machine=hppa1.1-hp
 		;;
 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
 		basic_machine=hppa1.0-hp
 		;;
 	hppa-next)
 		os=-nextstep3
 		;;
 	hppaosf)
 		basic_machine=hppa1.1-hp
 		os=-osf
 		;;
 	hppro)
 		basic_machine=hppa1.1-hp
 		os=-proelf
 		;;
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
 		;;
 	i*86v4*)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv4
 		;;
 	i*86v)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv
 		;;
 	i*86sol2)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-solaris2
 		;;
 	i386mach)
 		basic_machine=i386-mach
 		os=-mach
 		;;
 	i386-vsta | vsta)
 		basic_machine=i386-unknown
 		os=-vsta
 		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
 		    -irix*)
 			;;
 		    *)
 			os=-irix4
 			;;
 		esac
 		;;
 	isi68 | isi)
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
 	leon-*|leon[3-9]-*)
 		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
 		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
 		;;
 	m68knommu-*)
 		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
 	magnum | m3230)
 		basic_machine=mips-mips
 		os=-sysv
 		;;
 	merlin)
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
 	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw64)
 		basic_machine=x86_64-pc
 		os=-mingw64
 		;;
 	mingw32)
 		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
 		basic_machine=arm-unknown
 		os=-mingw32ce
 		;;
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
 	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
 	morphos)
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
 	moxiebox)
 		basic_machine=moxie-unknown
 		os=-moxiebox
 		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
 		;;
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
 		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
 	nacl)
 		basic_machine=le32-unknown
 		os=-nacl
 		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
 		;;
 	netbsd386)
 		basic_machine=i386-unknown
 		os=-netbsd
 		;;
 	netwinder)
 		basic_machine=armv4l-rebel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
 		basic_machine=m68k-sony
 		os=-newsos
 		;;
 	news1000)
 		basic_machine=m68030-sony
 		os=-newsos
 		;;
 	news-3600 | risc-news)
 		basic_machine=mips-sony
 		os=-newsos
 		;;
 	necv70)
 		basic_machine=v70-nec
 		os=-sysv
 		;;
 	next | m*-next )
 		basic_machine=m68k-next
 		case $os in
 		    -nextstep* )
 			;;
 		    -ns2*)
 		      os=-nextstep2
 			;;
 		    *)
 		      os=-nextstep3
 			;;
 		esac
 		;;
 	nh3000)
 		basic_machine=m68k-harris
 		os=-cxux
 		;;
 	nh[45]000)
 		basic_machine=m88k-harris
 		os=-cxux
 		;;
 	nindy960)
 		basic_machine=i960-intel
 		os=-nindy
 		;;
 	mon960)
 		basic_machine=i960-intel
 		os=-mon960
 		;;
 	nonstopux)
 		basic_machine=mips-compaq
 		os=-nonstopux
 		;;
 	np1)
 		basic_machine=np1-gould
 		;;
 	neo-tandem)
 		basic_machine=neo-tandem
 		;;
 	nse-tandem)
 		basic_machine=nse-tandem
 		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
 		;;
 	openrisc | openrisc-*)
 		basic_machine=or32-unknown
 		;;
 	os400)
 		basic_machine=powerpc-ibm
 		os=-os400
 		;;
 	OSE68000 | ose68000)
 		basic_machine=m68000-ericsson
 		os=-ose
 		;;
 	os68k)
 		basic_machine=m68k-none
 		os=-os68k
 		;;
 	pa-hitachi)
 		basic_machine=hppa1.1-hitachi
 		os=-hiuxwe2
 		;;
 	paragon)
 		basic_machine=i860-intel
 		os=-osf
 		;;
 	parisc)
 		basic_machine=hppa-unknown
 		os=-linux
 		;;
 	parisc-*)
 		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
 	pbb)
 		basic_machine=m68k-tti
 		;;
 	pc532 | pc532-*)
 		basic_machine=ns32k-pc532
 		;;
 	pc98)
 		basic_machine=i386-pc
 		;;
 	pc98-*)
 		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentium | p5 | k5 | k6 | nexgen | viac3)
 		basic_machine=i586-pc
 		;;
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=i686-pc
 		;;
 	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=i686-pc
 		;;
 	pentium4)
 		basic_machine=i786-pc
 		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentium4-*)
 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pn)
 		basic_machine=pn-gould
 		;;
 	power)	basic_machine=power-ibm
 		;;
 	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ps2)
 		basic_machine=i386-ibm
 		;;
 	pw32)
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
 	rdos | rdos64)
 		basic_machine=x86_64-pc
 		os=-rdos
 		;;
 	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
 	rom68k)
 		basic_machine=m68k-rom68k
 		os=-coff
 		;;
 	rm[46]00)
 		basic_machine=mips-siemens
 		;;
 	rtpc | rtpc-*)
 		basic_machine=romp-ibm
 		;;
 	s390 | s390-*)
 		basic_machine=s390-ibm
 		;;
 	s390x | s390x-*)
 		basic_machine=s390x-ibm
 		;;
 	sa29200)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
 	sb1)
 		basic_machine=mipsisa64sb1-unknown
 		;;
 	sb1el)
 		basic_machine=mipsisa64sb1el-unknown
 		;;
 	sde)
 		basic_machine=mipsisa32-sde
 		os=-elf
 		;;
 	sei)
 		basic_machine=mips-sei
 		os=-seiux
 		;;
 	sequent)
 		basic_machine=i386-sequent
 		;;
 	sh)
 		basic_machine=sh-hitachi
 		os=-hms
 		;;
 	sh5el)
 		basic_machine=sh5le-unknown
 		;;
 	sh64)
 		basic_machine=sh64-unknown
 		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=sparclite-wrs
 		os=-vxworks
 		;;
 	sps7)
 		basic_machine=m68k-bull
 		os=-sysv2
 		;;
 	spur)
 		basic_machine=spur-unknown
 		;;
 	st2000)
 		basic_machine=m68k-tandem
 		;;
 	stratus)
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
 	strongarm-* | thumb-*)
 		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
 	sun2os3)
 		basic_machine=m68000-sun
 		os=-sunos3
 		;;
 	sun2os4)
 		basic_machine=m68000-sun
 		os=-sunos4
 		;;
 	sun3os3)
 		basic_machine=m68k-sun
 		os=-sunos3
 		;;
 	sun3os4)
 		basic_machine=m68k-sun
 		os=-sunos4
 		;;
 	sun4os3)
 		basic_machine=sparc-sun
 		os=-sunos3
 		;;
 	sun4os4)
 		basic_machine=sparc-sun
 		os=-sunos4
 		;;
 	sun4sol2)
 		basic_machine=sparc-sun
 		os=-solaris2
 		;;
 	sun3 | sun3-*)
 		basic_machine=m68k-sun
 		;;
 	sun4)
 		basic_machine=sparc-sun
 		;;
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
 	sv1)
 		basic_machine=sv1-cray
 		os=-unicos
 		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
 		;;
 	t3e)
 		basic_machine=alphaev5-cray
 		os=-unicos
 		;;
 	t90)
 		basic_machine=t90-cray
 		os=-unicos
 		;;
 	tile*)
 		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
 	tx39el)
 		basic_machine=mipstx39el-unknown
 		;;
 	toad1)
 		basic_machine=pdp10-xkl
 		os=-tops20
 		;;
 	tower | tower-32)
 		basic_machine=m68k-ncr
 		;;
 	tpf)
 		basic_machine=s390x-ibm
 		os=-tpf
 		;;
 	udi29k)
 		basic_machine=a29k-amd
 		os=-udi
 		;;
 	ultra3)
 		basic_machine=a29k-nyu
 		os=-sym1
 		;;
 	v810 | necv810)
 		basic_machine=v810-nec
 		os=-none
 		;;
 	vaxv)
 		basic_machine=vax-dec
 		os=-sysv
 		;;
 	vms)
 		basic_machine=vax-dec
 		os=-vms
 		;;
 	vpp*|vx|vx-*)
 		basic_machine=f301-fujitsu
 		;;
 	vxworks960)
 		basic_machine=i960-wrs
 		os=-vxworks
 		;;
 	vxworks68)
 		basic_machine=m68k-wrs
 		os=-vxworks
 		;;
 	vxworks29k)
 		basic_machine=a29k-wrs
 		os=-vxworks
 		;;
 	w65*)
 		basic_machine=w65-wdc
 		os=-none
 		;;
 	w89k-*)
 		basic_machine=hppa1.1-winbond
 		os=-proelf
 		;;
 	xbox)
 		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
 	xscale-* | xscalee[bl]-*)
 		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
 		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
 		;;
 	z8k-*-coff)
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
 	z80-*-coff)
 		basic_machine=z80-unknown
 		os=-sim
 		;;
 	none)
 		basic_machine=none-none
 		os=-none
 		;;
 
 # Here we handle the default manufacturer of certain CPU types.  It is in
 # some cases the only manufacturer, in others, it is the most popular.
 	w89k)
 		basic_machine=hppa1.1-winbond
 		;;
 	op50n)
 		basic_machine=hppa1.1-oki
 		;;
 	op60c)
 		basic_machine=hppa1.1-oki
 		;;
 	romp)
 		basic_machine=romp-ibm
 		;;
 	mmix)
 		basic_machine=mmix-knuth
 		;;
 	rs6000)
 		basic_machine=rs6000-ibm
 		;;
 	vax)
 		basic_machine=vax-dec
 		;;
 	pdp10)
 		# there are many clones, so DEC is not a safe bet
 		basic_machine=pdp10-unknown
 		;;
 	pdp11)
 		basic_machine=pdp11-dec
 		;;
 	we32k)
 		basic_machine=we32k-att
 		;;
 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 		basic_machine=sparc-sun
 		;;
 	cydra)
 		basic_machine=cydra-cydrome
 		;;
 	orion)
 		basic_machine=orion-highlevel
 		;;
 	orion105)
 		basic_machine=clipper-highlevel
 		;;
 	mac | mpw | mac-mpw)
 		basic_machine=m68k-apple
 		;;
 	pmac | pmac-mpw)
 		basic_machine=powerpc-apple
 		;;
 	*-unknown)
 		# Make sure to match an already-canonicalized machine name.
 		;;
 	*)
 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
 		exit 1
 		;;
 esac
 
 # Here we canonicalize certain aliases for manufacturers.
 case $basic_machine in
 	*-digital*)
 		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
 		;;
 	*-commodore*)
 		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
 		;;
 	*)
 		;;
 esac
 
 # Decode manufacturer-specific aliases for certain operating systems.
 
 if [ x"$os" != x"" ]
 then
 case $os in
 	# First match some system type aliases
 	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
 	-auroraux)
 		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
 	-solaris)
 		os=-solaris2
 		;;
 	-svr4*)
 		os=-sysv4
 		;;
 	-unixware*)
 		os=-sysv4.2uw
 		;;
 	-gnu/linux*)
 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
 		;;
 	# First accept the basic system types.
 	# The portable systems comes first.
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* | -cloudabi* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
 		case $basic_machine in
 		    x86-* | i*86-*)
 			;;
 		    *)
 			os=-nto$os
 			;;
 		esac
 		;;
 	-nto-qnx*)
 		;;
 	-nto*)
 		os=`echo $os | sed -e 's|nto|nto-qnx|'`
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
 	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
 		;;
 	-linux-dietlibc)
 		os=-linux-dietlibc
 		;;
 	-linux*)
 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;
 	-sunos6*)
 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
 		;;
 	-opened*)
 		os=-openedition
 		;;
 	-os400*)
 		os=-os400
 		;;
 	-wince*)
 		os=-wince
 		;;
 	-osfrose*)
 		os=-osfrose
 		;;
 	-osf*)
 		os=-osf
 		;;
 	-utek*)
 		os=-bsd
 		;;
 	-dynix*)
 		os=-bsd
 		;;
 	-acis*)
 		os=-aos
 		;;
 	-atheos*)
 		os=-atheos
 		;;
 	-syllable*)
 		os=-syllable
 		;;
 	-386bsd)
 		os=-bsd
 		;;
 	-ctix* | -uts*)
 		os=-sysv
 		;;
 	-nova*)
 		os=-rtmk-nova
 		;;
 	-ns2 )
 		os=-nextstep2
 		;;
 	-nsk*)
 		os=-nsk
 		;;
 	# Preserve the version number of sinix5.
 	-sinix5.*)
 		os=`echo $os | sed -e 's|sinix|sysv|'`
 		;;
 	-sinix*)
 		os=-sysv4
 		;;
 	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
 		os=-sysv3
 		;;
 	-oss*)
 		os=-sysv3
 		;;
 	-svr4)
 		os=-sysv4
 		;;
 	-svr3)
 		os=-sysv3
 		;;
 	-sysvr4)
 		os=-sysv4
 		;;
 	# This must come after -sysvr4.
 	-sysv*)
 		;;
 	-ose*)
 		os=-ose
 		;;
 	-es1800*)
 		os=-ose
 		;;
 	-xenix)
 		os=-xenix
 		;;
 	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 		os=-mint
 		;;
 	-aros*)
 		os=-aros
 		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
 	-nacl*)
 		;;
 	-none)
 		;;
 	*)
 		# Get rid of the `-' at the beginning of $os.
 		os=`echo $os | sed 's/[^-]*-//'`
 		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
 		exit 1
 		;;
 esac
 else
 
 # Here we handle the default operating systems that come with various machines.
 # The value should be what the vendor currently ships out the door with their
 # machine or put another way, the most popular os provided with the machine.
 
 # Note that if you're going to try to match "-MANUFACTURER" here (say,
 # "-sun"), then you have to tell the case statement up towards the top
 # that MANUFACTURER isn't an operating system.  Otherwise, code above
 # will signal an error saying that MANUFACTURER isn't an operating
 # system, and we'll never get to this point.
 
 case $basic_machine in
 	score-*)
 		os=-elf
 		;;
 	spu-*)
 		os=-elf
 		;;
 	*-acorn)
 		os=-riscix1.2
 		;;
 	arm*-rebel)
 		os=-linux
 		;;
 	arm*-semi)
 		os=-aout
 		;;
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
 	c8051-*)
 		os=-elf
 		;;
 	hexagon-*)
 		os=-elf
 		;;
 	tic54x-*)
 		os=-coff
 		;;
 	tic55x-*)
 		os=-coff
 		;;
 	tic6x-*)
 		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=-tops20
 		;;
 	pdp11-*)
 		os=-none
 		;;
 	*-dec | vax-*)
 		os=-ultrix4.2
 		;;
 	m68*-apollo)
 		os=-domain
 		;;
 	i386-sun)
 		os=-sunos4.0.2
 		;;
 	m68000-sun)
 		os=-sunos3
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
 	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
 		os=-elf
 		;;
 	mips*-*)
 		os=-elf
 		;;
 	or32-*)
 		os=-coff
 		;;
 	*-tti)	# must be before sparc entry or we get the wrong os.
 		os=-sysv3
 		;;
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
 	*-be)
 		os=-beos
 		;;
 	*-haiku)
 		os=-haiku
 		;;
 	*-ibm)
 		os=-aix
 		;;
 	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
 		os=-proelf
 		;;
 	*-winbond)
 		os=-proelf
 		;;
 	*-oki)
 		os=-proelf
 		;;
 	*-hp)
 		os=-hpux
 		;;
 	*-hitachi)
 		os=-hiux
 		;;
 	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
 		os=-sysv
 		;;
 	*-cbm)
 		os=-amigaos
 		;;
 	*-dg)
 		os=-dgux
 		;;
 	*-dolphin)
 		os=-sysv3
 		;;
 	m68k-ccur)
 		os=-rtu
 		;;
 	m88k-omron*)
 		os=-luna
 		;;
 	*-next )
 		os=-nextstep
 		;;
 	*-sequent)
 		os=-ptx
 		;;
 	*-crds)
 		os=-unos
 		;;
 	*-ns)
 		os=-genix
 		;;
 	i370-*)
 		os=-mvs
 		;;
 	*-next)
 		os=-nextstep3
 		;;
 	*-gould)
 		os=-sysv
 		;;
 	*-highlevel)
 		os=-bsd
 		;;
 	*-encore)
 		os=-bsd
 		;;
 	*-sgi)
 		os=-irix
 		;;
 	*-siemens)
 		os=-sysv4
 		;;
 	*-masscomp)
 		os=-rtu
 		;;
 	f30[01]-fujitsu | f700-fujitsu)
 		os=-uxpv
 		;;
 	*-rom68k)
 		os=-coff
 		;;
 	*-*bug)
 		os=-coff
 		;;
 	*-apple)
 		os=-macos
 		;;
 	*-atari*)
 		os=-mint
 		;;
 	*)
 		os=-none
 		;;
 esac
 fi
 
 # Here we handle the case where we know the os, and the CPU type, but not the
 # manufacturer.  We pick the logical manufacturer.
 vendor=unknown
 case $basic_machine in
 	*-unknown)
 		case $os in
 			-riscix*)
 				vendor=acorn
 				;;
 			-sunos*)
 				vendor=sun
 				;;
 			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
 				vendor=be
 				;;
 			-hpux*)
 				vendor=hp
 				;;
 			-mpeix*)
 				vendor=hp
 				;;
 			-hiux*)
 				vendor=hitachi
 				;;
 			-unos*)
 				vendor=crds
 				;;
 			-dgux*)
 				vendor=dg
 				;;
 			-luna*)
 				vendor=omron
 				;;
 			-genix*)
 				vendor=ns
 				;;
 			-mvs* | -opened*)
 				vendor=ibm
 				;;
 			-os400*)
 				vendor=ibm
 				;;
 			-ptx*)
 				vendor=sequent
 				;;
 			-tpf*)
 				vendor=ibm
 				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=wrs
 				;;
 			-aux*)
 				vendor=apple
 				;;
 			-hms*)
 				vendor=hitachi
 				;;
 			-mpw* | -macos*)
 				vendor=apple
 				;;
 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
 				vendor=atari
 				;;
 			-vos*)
 				vendor=stratus
 				;;
 		esac
 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
 		;;
 esac
 
 echo $basic_machine$os
 exit
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "timestamp='"
 # time-stamp-format: "%:y-%02m-%02d"
 # time-stamp-end: "'"
 # End:
Index: projects/clang800-import/contrib/openpam/configure
===================================================================
--- projects/clang800-import/contrib/openpam/configure	(revision 344548)
+++ projects/clang800-import/contrib/openpam/configure	(revision 344549)
@@ -1,15354 +1,15422 @@
 #! /bin/sh
-# From configure.ac OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des .
+# From configure.ac OpenPAM: configure.ac 947 2019-02-24 20:18:17Z des .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenPAM 20170430.
+# Generated by GNU Autoconf 2.69 for OpenPAM 20190224.
 #
 # Report bugs to <des@des.no>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
 esac
 fi
 
 
 as_nl='
 '
 export as_nl
 # Printing a long string crashes Solaris 7 /usr/bin/printf.
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 # Prefer a ksh shell builtin over an external printf program on Solaris,
 # but without wasting forks for bash or zsh.
 if test -z "$BASH_VERSION$ZSH_VERSION" \
     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='print -r --'
   as_echo_n='print -rn --'
 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
     as_echo_n='/usr/ucb/echo -n'
   else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
       case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
       esac;
       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
     '
     export as_echo_n_body
     as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
   export as_echo_body
   as_echo='sh -c $as_echo_body as_echo'
 fi
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
       PATH_SEPARATOR=';'
   }
 fi
 
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
      ;;
 esac
 # We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
 # Unset variables that we do not need and which cause bugs (e.g. in
 # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
 # suppresses any "Segmentation fault" message there.  '((' could
 # trigger a bug in pdksh 5.2.14.
 for as_var in BASH_ENV ENV MAIL MAILPATH
 do eval test x\${$as_var+set} = xset \
   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
 LC_ALL=C
 export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
   if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
     _as_can_reexec=no; export _as_can_reexec;
     # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
 # works around shells that cannot unset nonexistent variables.
 # Preserve -v and -x to the replacement shell.
 BASH_ENV=/dev/null
 ENV=/dev/null
 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 case $- in # ((((
   *v*x* | *x*v* ) as_opts=-vx ;;
   *v* ) as_opts=-v ;;
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 as_fn_exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
 else
   case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
 esac
 fi
 "
   as_required="as_fn_return () { (exit \$1); }
 as_fn_success () { as_fn_return 0; }
 as_fn_failure () { as_fn_return 1; }
 as_fn_ret_success () { return 0; }
 as_fn_ret_failure () { return 1; }
 
 exitcode=0
 as_fn_success || { exitcode=1; echo as_fn_success failed.; }
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
 if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
 else
   exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1
 
   test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
     ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
     ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
     ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
     PATH=/empty FPATH=/empty; export PATH FPATH
     test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
       || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
 else
   as_have_required=no
 fi
   if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
 	     as_shell=$as_dir/$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
   CONFIG_SHELL=$as_shell as_have_required=yes
 		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
   break 2
 fi
 fi
 	   done;;
        esac
   as_found=false
 done
 $as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
 	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
   CONFIG_SHELL=$SHELL as_have_required=yes
 fi; }
 IFS=$as_save_IFS
 
 
       if test "x$CONFIG_SHELL" != x; then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
 # works around shells that cannot unset nonexistent variables.
 # Preserve -v and -x to the replacement shell.
 BASH_ENV=/dev/null
 ENV=/dev/null
 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 case $- in # ((((
   *v*x* | *x*v* ) as_opts=-vx ;;
   *v* ) as_opts=-v ;;
   *x* ) as_opts=-x ;;
   * ) as_opts= ;;
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
 # out after a failed `exec'.
 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
     if test x$as_have_required = xno; then :
   $as_echo "$0: This script requires a shell more modern than all"
   $as_echo "$0: the shells that I found on your system."
   if test x${ZSH_VERSION+set} = xset ; then
     $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and des@des.no about
 $0: your system, including any error possibly output before
 $0: this message. Then install a modern shell, or manually
 $0: run the script under such a shell if you do have one."
   fi
   exit 1
 fi
 fi
 fi
 SHELL=${CONFIG_SHELL-/bin/sh}
 export SHELL
 # Unset more variables known to interfere with behavior of common tools.
 CLICOLOR_FORCE= GREP_OPTIONS=
 unset CLICOLOR_FORCE GREP_OPTIONS
 
 ## --------------------- ##
 ## M4sh Shell Functions. ##
 ## --------------------- ##
 # as_fn_unset VAR
 # ---------------
 # Portably unset VAR.
 as_fn_unset ()
 {
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
 
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
 as_fn_set_status ()
 {
   return $1
 } # as_fn_set_status
 
 # as_fn_exit STATUS
 # -----------------
 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 as_fn_exit ()
 {
   set +e
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
 
 # as_fn_mkdir_p
 # -------------
 # Create "$as_dir" as a directory, including parents if necessary.
 as_fn_mkdir_p ()
 {
 
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
   test -d "$as_dir" || eval $as_mkdir_p || {
     as_dirs=
     while :; do
       case $as_dir in #(
       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
       as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
 
 # as_fn_executable_p FILE
 # -----------------------
 # Test if FILE is an executable regular file.
 as_fn_executable_p ()
 {
   test -f "$1" && test -x "$1"
 } # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
 else
   as_fn_append ()
   {
     eval $1=\$$1\$2
   }
 fi # as_fn_append
 
 # as_fn_arith ARG...
 # ------------------
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
 else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
 # script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
   $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false
 fi
 
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
 
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
   as_lineno_1=$LINENO as_lineno_1a=$LINENO
   as_lineno_2=$LINENO as_lineno_2a=$LINENO
   eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
   test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
   # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
   ' <$as_myself |
     sed '
       s/[$]LINENO.*/&-/
       t lineno
       b
       :lineno
       N
       :loop
       s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
       t loop
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
   # in an infinite loop.  This has already happened in practice.
   _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
   . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
   case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
   xy)  ECHO_C='\c';;
   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
        ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
   mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
     as_ln_s='cp -pR'
   fi
 else
   as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 SHELL=${CONFIG_SHELL-/bin/sh}
 
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
 ac_clean_files=
 ac_config_libobj_dir=.
 LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
 
 # Identity of this package.
 PACKAGE_NAME='OpenPAM'
 PACKAGE_TARNAME='openpam'
-PACKAGE_VERSION='20170430'
-PACKAGE_STRING='OpenPAM 20170430'
+PACKAGE_VERSION='20190224'
+PACKAGE_STRING='OpenPAM 20190224'
 PACKAGE_BUGREPORT='des@des.no'
 PACKAGE_URL='http://www.openpam.org/'
 
 ac_unique_file="lib/libpam/pam_start.c"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
 #ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
 # ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
 #ifdef HAVE_STRING_H
 # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
 #ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 WITH_TEST_FALSE
 WITH_TEST_TRUE
+HAVE_CRYB_TEST_FALSE
+HAVE_CRYB_TEST_TRUE
+CRYB_TEST_VERSION
 CRYB_TEST_LIBS
+CRYB_TEST_CFLAGS
 SYSTEM_LIBPAM
-CRYPTO_LIBS
-CRYPT_LIBS
 DL_LIBS
 WITH_SYSTEM_LIBPAM_FALSE
 WITH_SYSTEM_LIBPAM_TRUE
 WITH_SU_FALSE
 WITH_SU_TRUE
 WITH_PAMTEST_FALSE
 WITH_PAMTEST_TRUE
 WITH_PAM_UNIX_FALSE
 WITH_PAM_UNIX_TRUE
 WITH_DOC_FALSE
 WITH_DOC_TRUE
 CUSTOM_MODULES_DIR_FALSE
 CUSTOM_MODULES_DIR_TRUE
 OPENPAM_MODULES_DIR
 LIB_MAJ
+pkgconfigdir
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
 LT_SYS_LIBRARY_PATH
 OTOOL64
 OTOOL
 LIPO
 NMEDIT
 DSYMUTIL
 MANIFEST_TOOL
 RANLIB
 ac_ct_AR
 AR
 DLLTOOL
 OBJDUMP
 LN_S
 NM
 ac_ct_DUMPBIN
 DUMPBIN
 LD
 FGREP
 SED
 host_os
 host_vendor
 host_cpu
 host
 build_os
 build_vendor
 build_cpu
 build
 LIBTOOL
 EGREP
 GREP
 CPP
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
 am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
-am__quote
 am__include
 DEPDIR
 OBJEXT
 EXEEXT
 ac_ct_CC
 CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
 am__untar
 am__tar
 AMTAR
 am__leading_dot
 SET_MAKE
 AWK
 mkdir_p
 MKDIR_P
 INSTALL_STRIP_PROGRAM
 STRIP
 install_sh
 MAKEINFO
 AUTOHEADER
 AUTOMAKE
 AUTOCONF
 ACLOCAL
 VERSION
 PACKAGE
 CYGPATH_W
 am__isrc
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
 target_alias
 host_alias
 build_alias
 LIBS
 ECHO_T
 ECHO_N
 ECHO_C
 DEFS
 mandir
 localedir
 libdir
 psdir
 pdfdir
 dvidir
 htmldir
 infodir
 docdir
 oldincludedir
 includedir
 localstatedir
 sharedstatedir
 sysconfdir
 datadir
 datarootdir
 libexecdir
 sbindir
 bindir
 program_transform_name
 prefix
 exec_prefix
 PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
 PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
-SHELL'
+SHELL
+am__quote'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_silent_rules
 enable_dependency_tracking
 enable_static
 enable_shared
 with_pic
 enable_fast_install
 with_aix_soname
 with_gnu_ld
 with_sysroot
 enable_libtool_lock
+with_pkgconfigdir
 enable_debug
 enable_unversioned_modules
 with_modules_dir
 with_doc
 with_pam_unix
 with_pamtest
 with_su
 with_system_libpam
 enable_developer_warnings
 enable_debugging_symbols
 enable_werror
 '
       ac_precious_vars='build_alias
 host_alias
 target_alias
 CC
 CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-LT_SYS_LIBRARY_PATH'
+LT_SYS_LIBRARY_PATH
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+CRYB_TEST_CFLAGS
+CRYB_TEST_LIBS'
 
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
 ac_unrecognized_opts=
 ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
 exec_prefix=NONE
 no_create=
 no_recursion=
 prefix=NONE
 program_prefix=NONE
 program_suffix=NONE
 program_transform_name=s,x,x,
 silent=
 site=
 srcdir=
 verbose=
 x_includes=NONE
 x_libraries=NONE
 
 # Installation directory options.
 # These are left unexpanded so users can "make install exec_prefix=/foo"
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
 # (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
 datarootdir='${prefix}/share'
 datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
 pdfdir='${docdir}'
 psdir='${docdir}'
 libdir='${exec_prefix}/lib'
 localedir='${datarootdir}/locale'
 mandir='${datarootdir}/man'
 
 ac_prev=
 ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
     eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
   case $ac_option in
   *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
   *=)   ac_optarg= ;;
   *)    ac_optarg=yes ;;
   esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
     bindir=$ac_optarg ;;
 
   -build | --build | --buil | --bui | --bu)
     ac_prev=build_alias ;;
   -build=* | --build=* | --buil=* | --bui=* | --bu=*)
     build_alias=$ac_optarg ;;
 
   -cache-file | --cache-file | --cache-fil | --cache-fi \
   | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
     ac_prev=cache_file ;;
   -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
   | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
     cache_file=$ac_optarg ;;
 
   --config-cache | -C)
     cache_file=config.cache ;;
 
   -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
   -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
   -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
   | --dataroo | --dataro | --datar)
     ac_prev=datarootdir ;;
   -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
   | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
     datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval enable_$ac_useropt=no ;;
 
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=docdir ;;
   -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
     docdir=$ac_optarg ;;
 
   -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
     ac_prev=dvidir ;;
   -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
     dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
   | --exec | --exe | --ex)
     ac_prev=exec_prefix ;;
   -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
   | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
   | --exec=* | --exe=* | --ex=*)
     exec_prefix=$ac_optarg ;;
 
   -gas | --gas | --ga | --g)
     # Obsolete; use --with-gas.
     with_gas=yes ;;
 
   -help | --help | --hel | --he | -h)
     ac_init_help=long ;;
   -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
     ac_init_help=recursive ;;
   -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
     ac_init_help=short ;;
 
   -host | --host | --hos | --ho)
     ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
   -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
     ac_prev=htmldir ;;
   -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
   | --ht=*)
     htmldir=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
   | --includ=* | --inclu=* | --incl=* | --inc=*)
     includedir=$ac_optarg ;;
 
   -infodir | --infodir | --infodi | --infod | --info | --inf)
     ac_prev=infodir ;;
   -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
     infodir=$ac_optarg ;;
 
   -libdir | --libdir | --libdi | --libd)
     ac_prev=libdir ;;
   -libdir=* | --libdir=* | --libdi=* | --libd=*)
     libdir=$ac_optarg ;;
 
   -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
   -localedir | --localedir | --localedi | --localed | --locale)
     ac_prev=localedir ;;
   -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
     localedir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
   | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
   | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
     mandir=$ac_optarg ;;
 
   -nfp | --nfp | --nf)
     # Obsolete; use --without-fp.
     with_fp=no ;;
 
   -no-create | --no-create | --no-creat | --no-crea | --no-cre \
   | --no-cr | --no-c | -n)
     no_create=yes ;;
 
   -no-recursion | --no-recursion | --no-recursio | --no-recursi \
   | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
     no_recursion=yes ;;
 
   -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
   | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
   | --oldin | --oldi | --old | --ol | --o)
     ac_prev=oldincludedir ;;
   -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
   | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
   | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
     oldincludedir=$ac_optarg ;;
 
   -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
     ac_prev=prefix ;;
   -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
     prefix=$ac_optarg ;;
 
   -program-prefix | --program-prefix | --program-prefi | --program-pref \
   | --program-pre | --program-pr | --program-p)
     ac_prev=program_prefix ;;
   -program-prefix=* | --program-prefix=* | --program-prefi=* \
   | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
     program_prefix=$ac_optarg ;;
 
   -program-suffix | --program-suffix | --program-suffi | --program-suff \
   | --program-suf | --program-su | --program-s)
     ac_prev=program_suffix ;;
   -program-suffix=* | --program-suffix=* | --program-suffi=* \
   | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
     program_suffix=$ac_optarg ;;
 
   -program-transform-name | --program-transform-name \
   | --program-transform-nam | --program-transform-na \
   | --program-transform-n | --program-transform- \
   | --program-transform | --program-transfor \
   | --program-transfo | --program-transf \
   | --program-trans | --program-tran \
   | --progr-tra | --program-tr | --program-t)
     ac_prev=program_transform_name ;;
   -program-transform-name=* | --program-transform-name=* \
   | --program-transform-nam=* | --program-transform-na=* \
   | --program-transform-n=* | --program-transform-=* \
   | --program-transform=* | --program-transfor=* \
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
   -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
     ac_prev=pdfdir ;;
   -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
     pdfdir=$ac_optarg ;;
 
   -psdir | --psdir | --psdi | --psd | --ps)
     ac_prev=psdir ;;
   -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
     psdir=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   | --sbi=* | --sb=*)
     sbindir=$ac_optarg ;;
 
   -sharedstatedir | --sharedstatedir | --sharedstatedi \
   | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
   | --sharedst | --shareds | --shared | --share | --shar \
   | --sha | --sh)
     ac_prev=sharedstatedir ;;
   -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
   | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
   | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
   | --sha=* | --sh=*)
     sharedstatedir=$ac_optarg ;;
 
   -site | --site | --sit)
     ac_prev=site ;;
   -site=* | --site=* | --sit=*)
     site=$ac_optarg ;;
 
   -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
     ac_prev=srcdir ;;
   -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
     srcdir=$ac_optarg ;;
 
   -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
   | --syscon | --sysco | --sysc | --sys | --sy)
     ac_prev=sysconfdir ;;
   -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
   | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
     sysconfdir=$ac_optarg ;;
 
   -target | --target | --targe | --targ | --tar | --ta | --t)
     ac_prev=target_alias ;;
   -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
     target_alias=$ac_optarg ;;
 
   -v | -verbose | --verbose | --verbos | --verbo | --verb)
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers | -V)
     ac_init_version=: ;;
 
   -with-* | --with-*)
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
       as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
 "*) ;;
       *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
 	 ac_unrecognized_sep=', ';;
     esac
     eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
     with_x=yes ;;
 
   -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
   | --x-incl | --x-inc | --x-in | --x-i)
     ac_prev=x_includes ;;
   -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
   | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
     x_includes=$ac_optarg ;;
 
   -x-libraries | --x-libraries | --x-librarie | --x-librari \
   | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
   -*) as_fn_error $? "unrecognized option: \`$ac_option'
 Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
       as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
     esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
   as_fn_error $? "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
 # Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
   case $ac_val in
     */ )
       ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
       eval $ac_var=\$ac_val;;
   esac
   # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
   as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 build=$build_alias
 host=$host_alias
 target=$target_alias
 
 # FIXME: To remove some day.
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
 fi
 
 ac_tool_prefix=
 test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
 test "$silent" = yes && exec 6>/dev/null
 
 
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
   as_fn_error $? "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
   as_fn_error $? "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
   # Try the directory containing this script, then the parent directory.
   ac_confdir=`$as_dirname -- "$as_myself" ||
 $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
   srcdir=$ac_confdir
   if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
   srcdir=.
 fi
 # Remove unnecessary trailing slashes from srcdir.
 # Double slashes in file names in object file debugging info
 # mess up M-x gdb in Emacs.
 case $srcdir in
 */) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
 esac
 for ac_var in $ac_precious_vars; do
   eval ac_env_${ac_var}_set=\${${ac_var}+set}
   eval ac_env_${ac_var}_value=\$${ac_var}
   eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
   eval ac_cv_env_${ac_var}_value=\$${ac_var}
 done
 
 #
 # Report the --help message.
 #
 if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenPAM 20170430 to adapt to many kinds of systems.
+\`configure' configures OpenPAM 20190224 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 To assign environment variables (e.g., CC, CFLAGS...), specify them as
 VAR=VALUE.  See below for descriptions of some of the useful variables.
 
 Defaults for the options are specified in brackets.
 
 Configuration:
   -h, --help              display this help and exit
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
   -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
                           [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 an installation prefix other than \`$ac_default_prefix' using \`--prefix',
 for instance \`--prefix=\$HOME'.
 
 For better control, use the options below.
 
 Fine tuning of the installation directories:
   --bindir=DIR            user executables [EPREFIX/bin]
   --sbindir=DIR           system admin executables [EPREFIX/sbin]
   --libexecdir=DIR        program executables [EPREFIX/libexec]
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
   --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
   --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
   --infodir=DIR           info documentation [DATAROOTDIR/info]
   --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   --mandir=DIR            man documentation [DATAROOTDIR/man]
   --docdir=DIR            documentation root [DATAROOTDIR/doc/openpam]
   --htmldir=DIR           html documentation [DOCDIR]
   --dvidir=DIR            dvi documentation [DOCDIR]
   --pdfdir=DIR            pdf documentation [DOCDIR]
   --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
 
 Program names:
   --program-prefix=PREFIX            prepend PREFIX to installed program names
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
 
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenPAM 20170430:";;
+     short | recursive ) echo "Configuration of OpenPAM 20190224:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-dependency-tracking
                           do not reject slow dependency extractors
   --disable-dependency-tracking
                           speeds up one-time build
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
                           optimize for fast installation [default=yes]
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-debug          turn debugging macros on
   --disable-unversioned-modules
                           support loading of unversioned modules
   --enable-developer-warnings
                           enable strict warnings (default is NO)
   --enable-debugging-symbols
                           enable debugging symbols (default is NO)
   --enable-werror         use -Werror (default is NO)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-aix-soname=aix|svr4|both
                           shared library versioning (aka "SONAME") variant to
                           provide on AIX, [default=aix].
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
                           compiler's sysroot if not specified).
+  --with-pkgconfigdir     installation directory for .pc files
+                          [LIBDIR/pkgconfig]
   --with-modules-dir=DIR  OpenPAM modules directory
   --without-doc           do not build documentation
   --with-pam-unix         build sample pam_unix(8) module
   --with-pamtest          build test application
   --with-su               build sample su(1) implementation
   --with-system-libpam    use system libpam
 
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   LT_SYS_LIBRARY_PATH
               User-defined run-time library search path.
+  PKG_CONFIG  path to pkg-config binary
+  PKG_CONFIG_PATH
+              list of directories to prepend to default search path
+  PKG_CONFIG_LIBDIR
+              list of directories to search instead of default search path
+  CRYB_TEST_CFLAGS
+              C compiler flags for cryb-test
+  CRYB_TEST_LIBS
+              linker flags for cryb-test
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <des@des.no>.
 OpenPAM home page: <http://www.openpam.org/>.
 _ACEOF
 ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
     test -d "$ac_dir" ||
       { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
       continue
     ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
   ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
   ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
   esac ;;
 esac
 ac_abs_top_builddir=$ac_pwd
 ac_abs_builddir=$ac_pwd$ac_dir_suffix
 # for backward compatibility:
 ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
   .)  # We are building in place.
     ac_srcdir=.
     ac_top_srcdir=$ac_top_builddir_sub
     ac_abs_top_srcdir=$ac_pwd ;;
   [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
     ac_top_srcdir=$srcdir
     ac_abs_top_srcdir=$srcdir ;;
   *) # Relative name.
     ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_build_prefix$srcdir
     ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
     # Check for guested configure.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
     elif test -f "$ac_srcdir/configure"; then
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
       $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenPAM configure 20170430
+OpenPAM configure 20190224
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
 
 ## ------------------------ ##
 ## Autoconf initialization. ##
 ## ------------------------ ##
 
 # ac_fn_c_try_compile LINENO
 # --------------------------
 # Try to compile conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     grep -v '^ *+' conftest.err >conftest.er1
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then :
   ac_retval=0
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
 
 # ac_fn_c_try_cpp LINENO
 # ----------------------
 # Try to preprocess conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_cpp ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if { { ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     grep -v '^ *+' conftest.err >conftest.er1
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
   ac_retval=0
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
 # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists, giving a warning if it cannot be compiled using
 # the include files in INCLUDES and setting the cache variable VAR
 # accordingly.
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 else
   # Is the header compilable?
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
 $as_echo_n "checking $2 usability... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_header_compiler=yes
 else
   ac_header_compiler=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
 $as_echo "$ac_header_compiler" >&6; }
 
 # Is the header present?
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
 $as_echo_n "checking $2 presence... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <$2>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   ac_header_preproc=yes
 else
   ac_header_preproc=no
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 $as_echo "$ac_header_preproc" >&6; }
 
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
   yes:no: )
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
 $as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
     ;;
   no:yes:* )
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
 $as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
 $as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
 $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 ( $as_echo "## ------------------------- ##
 ## Report this to des@des.no ##
 ## ------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
 # ac_fn_c_try_run LINENO
 # ----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
 # that executables *can* be run.
 ac_fn_c_try_run ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then :
   ac_retval=0
 else
   $as_echo "$as_me: program exited with status $ac_status" >&5
        $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
 
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
 # INCLUDES, setting the cache variable VAR accordingly.
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
 else
   eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
 # ac_fn_c_try_link LINENO
 # -----------------------
 # Try to link conftest.$ac_ext, and return whether this succeeded.
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   rm -f conftest.$ac_objext conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     grep -v '^ *+' conftest.err >conftest.er1
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
   # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
   # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
 
 # ac_fn_c_check_func LINENO FUNC VAR
 # ----------------------------------
 # Tests whether FUNC exists, setting the cache variable VAR accordingly
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
 if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 #define $2 innocuous_$2
 
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $2 (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
 
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char $2 ();
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
 #if defined __stub_$2 || defined __stub___$2
 choke me
 #endif
 
 int
 main ()
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   eval "$3=yes"
 else
   eval "$3=no"
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenPAM $as_me 20170430, which was
+It was created by OpenPAM $as_me 20190224, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
 exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
 ## Platform. ##
 ## --------- ##
 
 hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
 uname -m = `(uname -m) 2>/dev/null || echo unknown`
 uname -r = `(uname -r) 2>/dev/null || echo unknown`
 uname -s = `(uname -s) 2>/dev/null || echo unknown`
 uname -v = `(uname -v) 2>/dev/null || echo unknown`
 
 /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
 /bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
 /usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 
 _ASUNAME
 
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     $as_echo "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
 } >&5
 
 cat >&5 <<_ACEOF
 
 
 ## ----------- ##
 ## Core tests. ##
 ## ----------- ##
 
 _ACEOF
 
 
 # Keep a trace of the command line.
 # Strip out --no-create and --no-recursion so they do not pile up.
 # Strip out --silent because we don't want to record it for future runs.
 # Also quote any args containing shell meta-characters.
 # Make two passes to allow for proper duplicate-argument suppression.
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
   for ac_arg
   do
     case $ac_arg in
     -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
       as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
 	case $ac_arg in
 	  *=* | --config-cache | -C | -disable-* | --disable-* \
 	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
 	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
 	  | -with-* | --with-* | -without-* | --without-* | --x)
 	    case "$ac_configure_args0 " in
 	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
 	    esac
 	    ;;
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
       as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
 { ac_configure_args0=; unset ac_configure_args0;}
 { ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
     echo
 
     $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
   for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
   (set) 2>&1 |
     case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
       sed -n \
 	"s/'\''/'\''\\\\'\'''\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
       ;; #(
     *)
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 )
     echo
 
     $as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
       eval ac_val=\$$ac_var
       case $ac_val in
       *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
       $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
 	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
 	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
       $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
       cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
       $as_echo "$as_me: caught signal $ac_signal"
     $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
   trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
 $as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_URL "$PACKAGE_URL"
 _ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
 ac_site_file1=NONE
 ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
   # We do not want a PATH search for config.site.
   case $CONFIG_SITE in #((
     -*)  ac_site_file1=./$CONFIG_SITE;;
     */*) ac_site_file1=$CONFIG_SITE;;
     *)   ac_site_file1=./$CONFIG_SITE;;
   esac
 elif test "x$prefix" != xNONE; then
   ac_site_file1=$prefix/share/config.site
   ac_site_file2=$prefix/etc/config.site
 else
   ac_site_file1=$ac_default_prefix/share/config.site
   ac_site_file2=$ac_default_prefix/etc/config.site
 fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
   if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
 See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
 for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
   eval ac_old_val=\$ac_cv_env_${ac_var}_value
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
       { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
       { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
 	# differences in whitespace do not lead to failure.
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
 	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
 	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
     *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
       *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
   as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
 ## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
-am__api_version='1.15'
+am__api_version='1.16'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
     break
   elif test -f "$ac_dir/install.sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install.sh -c"
     break
   elif test -f "$ac_dir/shtool"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/shtool install -c"
     break
   fi
 done
 if test -z "$ac_aux_dir"; then
   as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
 # and are intended to be withdrawn in a future Autoconf release.
 # They can cause serious problems if a builder's source tree is in a directory
 # whose full name contains unusual characters.
 ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
 ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
 # SunOS /usr/etc/install
 # IRIX /sbin/install
 # AIX /bin/install
 # AmigaOS /C/install, which installs bootblocks on floppy discs
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
 if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     # Account for people who put trailing slashes in PATH elements.
 case $as_dir/ in #((
   ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
   ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
     # Don't use installbsd from OSF since it installs stuff as root
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
 	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
 	    :
 	  elif test $ac_prog = install &&
 	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
 	    rm -rf conftest.one conftest.two conftest.dir
 	    echo one > conftest.one
 	    echo two > conftest.two
 	    mkdir conftest.dir
 	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
 	      test -s conftest.one && test -s conftest.two &&
 	      test -s conftest.dir/conftest.one &&
 	      test -s conftest.dir/conftest.two
 	    then
 	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
 	      break 3
 	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
 
   done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
     # As a last resort, use the slow shell script.  Don't cache a
     # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
 test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
     as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
     as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
 # Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
    am_has_slept=no
    for am_try in 1 2; do
      echo "timestamp, slept: $am_has_slept" > conftest.file
      set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
      if test "$*" = "X"; then
 	# -L didn't work.
 	set X `ls -t "$srcdir/configure" conftest.file`
      fi
      if test "$*" != "X $srcdir/configure conftest.file" \
 	&& test "$*" != "X conftest.file $srcdir/configure"; then
 
 	# If neither matched, then we have a broken ls.  This can happen
 	# if, for instance, CONFIG_SHELL is bash and it inherits a
 	# broken ls alias from the environment.  This has actually
 	# happened.  Such a system could not be considered "sane".
 	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
   alias in your environment" "$LINENO" 5
      fi
      if test "$2" = conftest.file || test $am_try -eq 2; then
        break
      fi
      # Just in case.
      sleep 1
      am_has_slept=yes
    done
    test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
    as_fn_error $? "newly created file is older than distributed files!
 Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 # If we didn't sleep, we still need to ensure time stamps of config.status and
 # generated files are strictly newer.
 am_sleep_pid=
 if grep 'slept: no' conftest.file >/dev/null 2>&1; then
   ( sleep 1 ) &
   am_sleep_pid=$!
 fi
 
 rm -f conftest.file
 
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.
 # By default was `s,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 # Expand $ac_aux_dir to an absolute path.
 am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
   *)
     MISSING="\${SHELL} $am_aux_dir/missing" ;;
   esac
 fi
 # Use eval to expand $SHELL
 if eval "$MISSING --is-lightweight"; then
   am_missing_run="$MISSING "
 else
   am_missing_run=
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
   *)
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
 
 # Installed binaries are usually stripped using 'strip' when the user
 # run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
 # will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
     STRIP=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
   fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
 
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
   if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
 	     'mkdir (fileutils) '4.1*)
 	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
 	       break 3;;
 	   esac
 	 done
        done
   done
 IFS=$as_save_IFS
 
 fi
 
   test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
     # As a last resort, use the slow shell script.  Don't cache a
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$AWK" && break
 done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL = /bin/sh
 all:
 	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
 case `${MAKE-make} -f conftest.make 2>/dev/null` in
   *@@@%%%=?*=@@@%%%*)
     eval ac_cv_prog_make_${ac_make}_set=yes;;
   *)
     eval ac_cv_prog_make_${ac_make}_set=no;;
 esac
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 rm -rf .tst 2>/dev/null
 mkdir .tst 2>/dev/null
 if test -d .tst; then
   am__leading_dot=.
 else
   am__leading_dot=_
 fi
 rmdir .tst 2>/dev/null
 
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
 case $enable_silent_rules in # (((
   yes) AM_DEFAULT_VERBOSITY=0;;
    no) AM_DEFAULT_VERBOSITY=1;;
     *) AM_DEFAULT_VERBOSITY=1;;
 esac
 am_make=${MAKE-make}
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
 $as_echo_n "checking whether $am_make supports nested variables... " >&6; }
 if ${am_cv_make_support_nested_variables+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if $as_echo 'TRUE=$(BAR$(V))
 BAR0=false
 BAR1=true
 V=1
 am__doit:
 	@$(TRUE)
 .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
   am_cv_make_support_nested_variables=yes
 else
   am_cv_make_support_nested_variables=no
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
 $as_echo "$am_cv_make_support_nested_variables" >&6; }
 if test $am_cv_make_support_nested_variables = yes; then
     AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
   AM_V=$AM_DEFAULT_VERBOSITY
   AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
 fi
 AM_BACKSLASH='\'
 
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
     as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
 # test whether we have cygpath
 if test -z "$CYGPATH_W"; then
   if (cygpath --version) >/dev/null 2>/dev/null; then
     CYGPATH_W='cygpath -w'
   else
     CYGPATH_W=echo
   fi
 fi
 
 
 # Define the identity of the package.
  PACKAGE='openpam'
- VERSION='20170430'
+ VERSION='20190224'
 
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"
 _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
 #define VERSION "$VERSION"
 _ACEOF
 
 # Some tools Automake needs.
 
 ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
 
 
 AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
 
 
 AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
 
 
 AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # For better backward compatibility.  To be removed once Automake 1.9.x
 # dies out for good.  For more background, see:
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
-# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
 # We need awk for the "check" target (and possibly the TAP driver).  The
 # system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
 
 # We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar  pax cpio none'
 
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
 # recipes.  So use an aggressive probe to check that the usage we want is
 # actually supported "in the wild" to an acceptable degree.
 # See automake bug#10828.
 # To make any issue more visible, cause the running configure to be aborted
 # by default if the 'rm' program in use doesn't match our expectations; the
 # user can still override this though.
 if rm -f && rm -fr && rm -rf; then : OK; else
   cat >&2 <<'END'
 Oops!
 
 Your 'rm' program seems unable to run without file operands specified
 on the command line, even when the '-f' option is present.  This is contrary
 to the behaviour of most rm programs out there, and not conforming with
 the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
 
 Please tell bug-automake@gnu.org about your system, including the value
 of your $PATH and any error possibly output before this message.  This
 can help us improve future automake versions.
 
 END
   if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
     echo 'Configuration will proceed anyway, since you have set the' >&2
     echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
     echo >&2
   else
     cat >&2 <<'END'
 Aborting the configuration process, to ensure you take notice of the issue.
 
 You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <http://www.gnu.org/software/coreutils/>.
+that behaves properly: <https://www.gnu.org/software/coreutils/>.
 
 If you want to complete the configuration process using your problematic
 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
 to "yes", and re-run configure.
 
 END
     as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
   fi
 fi
 
 ac_config_headers="$ac_config_headers config.h"
 
 
 # C compiler and features
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_CC" = x; then
     CC=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
   if test $# != 0; then
     # We chose a different compiler from the bogus one.
     # However, it has the same basename, so the bogon will be chosen
     # first if we set CC to just the basename; use the full file name.
     shift
     ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
   fi
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
   for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$ac_ct_CC" && break
 done
 
   if test "x$ac_ct_CC" = x; then
     CC=""
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
   fi
 fi
 
 fi
 
 
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
 See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     sed '10a\
 ... rest of stderr output deleted ...
          10q' conftest.err >conftest.er1
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
 $as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
 
 ac_rmfiles=
 for ac_file in $ac_files
 do
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles="$ac_rmfiles $ac_file";;
   esac
 done
 rm -f $ac_rmfiles
 
 if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
 for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
 	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
 	# safe: cross compilers may not add the suffix if given an `-o'
 	# argument, so we may need to know it at that point already.
 	# Even if this section looks crufty: it has the advantage of
 	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
 else
   ac_file=''
 fi
 if test -z "$ac_file"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
 See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
 $as_echo_n "checking for C compiler default output file name... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
 $as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
 # `rm'.
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 int
 main ()
 {
 FILE *f = fopen ("conftest.out", "w");
  return ferror (f) || fclose (f) != 0;
 
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
 $as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
 See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
 $as_echo "$cross_compiling" >&6; }
 
 rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
 if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.o conftest.obj
 if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 #ifndef __GNUC__
        choke me
 #endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
   ac_compiler_gnu=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
 if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
   CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
 else
   ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
     CFLAGS="-O2"
   else
     CFLAGS=
   fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
 struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
 static char *e (p, i)
      char **p;
      int i;
 {
   return p[i];
 }
 static char *f (char * (*g) (char **, int), char **p, ...)
 {
   char *s;
   va_list v;
   va_start (v,p);
   s = g (p, va_arg (v,int));
   va_end (v);
   return s;
 }
 
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
    as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
    that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
 /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
    inside strings and character constants.  */
 #define FOO(x) 'x'
 int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
 int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
 int argc;
 char **argv;
 int
 main ()
 {
 return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   ;
   return 0;
 }
 _ACEOF
 for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 if test "x$ac_cv_prog_cc_c89" != xno; then :
 
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
 $as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
 if ${am_cv_prog_cc_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
   # Make sure it works both with $CC and with simple cc.
   # Following AC_PROG_CC_C_O, we do the test twice because some
   # compilers refuse to overwrite an existing .o file with -o,
   # though they will create one.
   am_cv_prog_cc_c_o=yes
   for am_i in 1 2; do
     if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
    ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } \
          && test -f conftest2.$ac_objext; then
       : OK
     else
       am_cv_prog_cc_c_o=no
       break
     fi
   done
   rm -f core conftest*
   unset am_i
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
 $as_echo "$am_cv_prog_cc_c_o" >&6; }
 if test "$am_cv_prog_cc_c_o" != yes; then
    # Losing compiler, so override with the script.
    # FIXME: It is wrong to rewrite CC.
    # But if we don't then we get into trouble of one sort or another.
    # A longer-term fix would be to have automake use am__CC in this case,
    # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
    CC="$am_aux_dir/compile $CC"
 fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
 
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
 am__doit:
-	@echo this is the am__doit target
+	@echo this is the am__doit target >confinc.out
 .PHONY: am__doit
 END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from 'make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+  case $?:`cat confinc.out 2>/dev/null` in #(
+  '0:this is the am__doit target') :
+    case $s in #(
+  BSD) :
+    am__include='.include' am__quote='"' ;; #(
+  *) :
+    am__include='include' am__quote='' ;;
+esac ;; #(
+  *) :
      ;;
-   esac
-fi
+esac
+  if test "$am__include" != "#"; then
+    _am_result="yes ($s style)"
+    break
+  fi
+done
+rm -f confinc.* confmf.*
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+$as_echo "${_am_result}" >&6; }
 
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
 # Check whether --enable-dependency-tracking was given.
 if test "${enable_dependency_tracking+set}" = set; then :
   enableval=$enable_dependency_tracking;
 fi
 
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
   am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
   AMDEP_TRUE='#'
   AMDEP_FALSE=
 fi
 
 
 
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
 if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named 'D' -- because '-MD' means "put the output
   # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
   # We will build objects and dependencies in a subdirectory because
   # it helps to detect inapplicable dependency modes.  For instance
   # both Tru64's cc and ICC support -MD to output dependencies as a
   # side effect of compilation, but ICC will put the dependencies in
   # the current directory while Tru64 will put them in the object
   # directory.
   mkdir sub
 
   am_cv_CC_dependencies_compiler_type=none
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   am__universal=false
   case " $depcc " in #(
      *\ -arch\ *\ -arch\ *) am__universal=true ;;
      esac
 
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
     # we should not choose a depcomp mode which is confused by this.
     #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
       # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
       # Solaris 10 /bin/sh.
       echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
     # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle '-M -o', and we need to detect this.  Also, some Intel
     # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
     gcc)
       # This depmode causes a compiler race in universal mode.
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
       # After this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
       am__minus_obj=
       ;;
     none) break ;;
     esac
     if depmode=$depmode \
        source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
        grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
       # that says an option was ignored or not supported.
       # When given -MP, icc 7.0 and 7.1 complain thusly:
       #   icc: Command line warning: ignoring option '-M'; no argument required
       # The diagnosis changed in icc 8.0:
       #   icc: Command line remark: option '-MP' not supported
       if (grep 'ignoring option' conftest.err ||
           grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
         am_cv_CC_dependencies_compiler_type=$depmode
         break
       fi
     fi
   done
 
   cd ..
   rm -rf conftest.dir
 else
   am_cv_CC_dependencies_compiler_type=none
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
  if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
   am__fastdepCC_FALSE='#'
 else
   am__fastdepCC_TRUE='#'
   am__fastdepCC_FALSE=
 fi
 
 
    case $ac_cv_prog_cc_stdc in #(
   no) :
     ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #(
   *) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
 if ${ac_cv_prog_cc_c99+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c99=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <wchar.h>
 #include <stdio.h>
 
 // Check varargs macros.  These examples are taken from C99 6.10.3.5.
 #define debug(...) fprintf (stderr, __VA_ARGS__)
 #define showlist(...) puts (#__VA_ARGS__)
 #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
 static void
 test_varargs_macros (void)
 {
   int x = 1234;
   int y = 5678;
   debug ("Flag");
   debug ("X = %d\n", x);
   showlist (The first, second, and third items.);
   report (x>y, "x is %d but y is %d", x, y);
 }
 
 // Check long long types.
 #define BIG64 18446744073709551615ull
 #define BIG32 4294967295ul
 #define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
 #if !BIG_OK
   your preprocessor is broken;
 #endif
 #if BIG_OK
 #else
   your preprocessor is broken;
 #endif
 static long long int bignum = -9223372036854775807LL;
 static unsigned long long int ubignum = BIG64;
 
 struct incomplete_array
 {
   int datasize;
   double data[];
 };
 
 struct named_init {
   int number;
   const wchar_t *name;
   double average;
 };
 
 typedef const char *ccp;
 
 static inline int
 test_restrict (ccp restrict text)
 {
   // See if C++-style comments work.
   // Iterate through items via the restricted pointer.
   // Also check for declarations in for loops.
   for (unsigned int i = 0; *(text+i) != '\0'; ++i)
     continue;
   return 0;
 }
 
 // Check varargs and va_copy.
 static void
 test_varargs (const char *format, ...)
 {
   va_list args;
   va_start (args, format);
   va_list args_copy;
   va_copy (args_copy, args);
 
   const char *str;
   int number;
   float fnumber;
 
   while (*format)
     {
       switch (*format++)
 	{
 	case 's': // string
 	  str = va_arg (args_copy, const char *);
 	  break;
 	case 'd': // int
 	  number = va_arg (args_copy, int);
 	  break;
 	case 'f': // float
 	  fnumber = va_arg (args_copy, double);
 	  break;
 	default:
 	  break;
 	}
     }
   va_end (args_copy);
   va_end (args);
 }
 
 int
 main ()
 {
 
   // Check bool.
   _Bool success = false;
 
   // Check restrict.
   if (test_restrict ("String literal") == 0)
     success = true;
   char *restrict newvar = "Another string";
 
   // Check varargs.
   test_varargs ("s, d' f .", "string", 65, 34.234);
   test_varargs_macros ();
 
   // Check flexible array members.
   struct incomplete_array *ia =
     malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
   ia->datasize = 10;
   for (int i = 0; i < ia->datasize; ++i)
     ia->data[i] = i * 1.234;
 
   // Check named initializers.
   struct named_init ni = {
     .number = 34,
     .name = L"Test wide string",
     .average = 543.34343,
   };
 
   ni.number = 58;
 
   int dynamic_array[ni.number];
   dynamic_array[ni.number - 1] = 543;
 
   // work around unused variable warnings
   return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
 	  || dynamic_array[ni.number - 1] != 543);
 
   ;
   return 0;
 }
 _ACEOF
 for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c99=$ac_arg
 fi
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c99" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c99" in
   x)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c99"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
 $as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
 esac
 if test "x$ac_cv_prog_cc_c99" != xno; then :
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
 if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
 struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
 static char *e (p, i)
      char **p;
      int i;
 {
   return p[i];
 }
 static char *f (char * (*g) (char **, int), char **p, ...)
 {
   char *s;
   va_list v;
   va_start (v,p);
   s = g (p, va_arg (v,int));
   va_end (v);
   return s;
 }
 
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
    as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
    that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
 /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
    inside strings and character constants.  */
 #define FOO(x) 'x'
 int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
 int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
 int argc;
 char **argv;
 int
 main ()
 {
 return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   ;
   return 0;
 }
 _ACEOF
 for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
   if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
 if test "x$ac_cv_prog_cc_c89" != xno; then :
   ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
 else
   ac_cv_prog_cc_stdc=no
 fi
 
 fi
  ;;
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5
 $as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; }
   if ${ac_cv_prog_cc_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 
   case $ac_cv_prog_cc_stdc in #(
   no) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;; #(
   '') :
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;; #(
   *) :
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5
 $as_echo "$ac_cv_prog_cc_stdc" >&6; } ;;
 esac
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
 $as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
   if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
 
 else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CPP=$CPP
 
 fi
   CPP=$ac_cv_prog_CPP
 else
   ac_cv_prog_CPP=$CPP
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
 
 else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then :
 
 else
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
   ac_path_GREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
   ac_count=0
   $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
       ac_path_GREP_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
   done
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
       $ac_path_GREP_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
     as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
 if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
      if test -z "$EGREP"; then
   ac_path_EGREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
   ac_count=0
   $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
       ac_path_EGREP_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
   done
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
       $ac_path_EGREP_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
     as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
 fi
 
    fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
 if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
   ac_cv_header_stdc=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "memchr" >/dev/null 2>&1; then :
 
 else
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   $EGREP "free" >/dev/null 2>&1; then :
 
 else
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
   if test "$cross_compiling" = yes; then :
   :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
 		   (('a' <= (c) && (c) <= 'i') \
 		     || ('j' <= (c) && (c) <= 'r') \
 		     || ('s' <= (c) && (c) <= 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
 
 #define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
 main ()
 {
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
       return 2;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
 
 else
   ac_cv_header_stdc=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
   conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
 $as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 "
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
 
 
   ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
 if test "x$ac_cv_header_minix_config_h" = xyes; then :
   MINIX=yes
 else
   MINIX=
 fi
 
 
   if test "$MINIX" = yes; then
 
 $as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
 
 $as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
 
 $as_echo "#define _MINIX 1" >>confdefs.h
 
   fi
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
 if ${ac_cv_safe_to_define___extensions__+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #         define __EXTENSIONS__ 1
           $ac_includes_default
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_safe_to_define___extensions__=yes
 else
   ac_cv_safe_to_define___extensions__=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
 $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   test $ac_cv_safe_to_define___extensions__ = yes &&
     $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
 
   $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
 
   $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
 
   $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this sort of thing.  */
   typedef int charset[2];
   const charset cs = { 0, 0 };
   /* SunOS 4.1.1 cc rejects this.  */
   char const *const *pcpcc;
   char **ppc;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
   /* AIX XL C 1.02.0.0 rejects this.
      It does not let you subtract one const X* pointer from another in
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
   pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
   ++pcpcc;
   ppc = (char**) pcpcc;
   pcpcc = (char const *const *) ppc;
   { /* SCO 3.2v4 cc rejects this sort of thing.  */
     char tx;
     char *t = &tx;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
     if (s) return 0;
   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};
     const int *foo = &x[0];
     ++foo;
   }
   { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
     typedef const int *iptr;
     iptr p = 0;
     ++p;
   }
   { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying
        "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
     struct s { int j; const int *ap[3]; } bx;
     struct s *b = &bx; b->j = 5;
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
     if (!foo) return 0;
   }
   return !cs[0] && !zero.x;
 #endif
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
 else
   ac_cv_c_const=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
 $as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
 $as_echo "#define const /**/" >>confdefs.h
 
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
 if ${ac_cv_c_restrict+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_restrict=no
    # The order here caters to the fact that C++ does not require restrict.
    for ac_kw in __restrict __restrict__ _Restrict restrict; do
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 typedef int * int_ptr;
 	int foo (int_ptr $ac_kw ip) {
 	return ip[0];
        }
 int
 main ()
 {
 int s[1];
 	int * $ac_kw t = s;
 	t[0] = 0;
 	return foo(t)
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_restrict=$ac_kw
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
      test "$ac_cv_c_restrict" != no && break
    done
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
 $as_echo "$ac_cv_c_restrict" >&6; }
 
  case $ac_cv_c_restrict in
    restrict) ;;
    no) $as_echo "#define restrict /**/" >>confdefs.h
  ;;
    *)  cat >>confdefs.h <<_ACEOF
 #define restrict $ac_cv_c_restrict
 _ACEOF
  ;;
  esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
 $as_echo_n "checking for working volatile... " >&6; }
 if ${ac_cv_c_volatile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
 volatile int x;
 int * volatile y = (int *) 0;
 return !x && !y;
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_volatile=yes
 else
   ac_cv_c_volatile=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
 $as_echo "$ac_cv_c_volatile" >&6; }
 if test $ac_cv_c_volatile = no; then
 
 $as_echo "#define volatile /**/" >>confdefs.h
 
 fi
 
 
 # libtool
 
 case `pwd` in
   *\ * | *\	*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
 
 
 macro_version='2.4.6'
 macro_revision='2.4.6'
 
 
 
 
 
 
 
 
 
 
 
 
 
 ltmain=$ac_aux_dir/ltmain.sh
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
 if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
   as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
 set x $ac_cv_build
 shift
 build_cpu=$1
 build_vendor=$2
 shift; shift
 # Remember, the first character of IFS is used to create $*,
 # except with old shells:
 build_os=$*
 IFS=$ac_save_IFS
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
 if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
     as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
 set x $ac_cv_host
 shift
 host_cpu=$1
 host_vendor=$2
 shift; shift
 # Remember, the first character of IFS is used to create $*,
 # except with old shells:
 host_os=$*
 IFS=$ac_save_IFS
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 # Backslashify metacharacters that are still active within
 # double-quoted strings.
 sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
 
 # Same as above, but do not quote variable references.
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
 # Sed substitution to delay expansion of an escaped shell variable in a
 # double_quote_subst'ed string.
 delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 
 # Sed substitution to delay expansion of an escaped single quote.
 delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
 
 # Sed substitution to avoid accidental globbing in evaled expressions
 no_glob_subst='s/\*/\\\*/g'
 
 ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
 ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
 $as_echo_n "checking how to print strings... " >&6; }
 # Test print first, because it will be a builtin if present.
 if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
    test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
   ECHO='print -r --'
 elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
   ECHO='printf %s\n'
 else
   # Use this function as a fallback that always works.
   func_fallback_echo ()
   {
     eval 'cat <<_LTECHO_EOF
 $1
 _LTECHO_EOF'
   }
   ECHO='func_fallback_echo'
 fi
 
 # func_echo_all arg...
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
     $ECHO ""
 }
 
 case $ECHO in
   printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
 $as_echo "printf" >&6; } ;;
   print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
 $as_echo "print -r" >&6; } ;;
   *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
 $as_echo "cat" >&6; } ;;
 esac
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
 if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
      { ac_script=; unset ac_script;}
      if test -z "$SED"; then
   ac_path_SED_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
 *)
   ac_count=0
   $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
     $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
       ac_path_SED_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
   done
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
       $ac_path_SED_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
     as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
 test -z "$SED" && SED=sed
 Xsed="$SED -e 1s/^X//"
 
 
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
 if ${ac_cv_path_FGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
    then ac_cv_path_FGREP="$GREP -F"
    else
      if test -z "$FGREP"; then
   ac_path_FGREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
 *)
   ac_count=0
   $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
     $as_echo 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_FGREP="$ac_path_FGREP"
       ac_path_FGREP_max=$ac_count
     fi
     # 10*(2^10) chars as input seems more than enough
     test $ac_count -gt 10 && break
   done
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
 
       $ac_path_FGREP_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
     as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
 fi
 
    fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
 $as_echo "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
 
 test -z "$GREP" && GREP=grep
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 # Check whether --with-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes
 else
   with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test yes = "$GCC"; then
   # Check if gcc -print-prog-name=ld gives a path.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return, which upsets mingw
     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
   *)
     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
   esac
   case $ac_prog in
     # Accept absolute paths.
     [\\/]* | ?:[\\/]*)
       re_direlt='/[^/][^/]*/\.\./'
       # Canonicalize the pathname of ld
       ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
       while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
       done
       test -z "$LD" && LD=$ac_prog
       ;;
   "")
     # If it fails, then pretend we aren't using GCC.
     ac_prog=ld
     ;;
   *)
     # If it is relative, then search for the first ld in PATH.
     with_gnu_ld=unknown
     ;;
   esac
 elif test yes = "$with_gnu_ld"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
 if ${lt_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
       lt_cv_path_LD=$ac_dir/$ac_prog
       # Check to see if the program is GNU ld.  I'd rather use --version,
       # but apparently some variants of GNU ld only accept -v.
       # Break only if it was the GNU/non-GNU ld that we prefer.
       case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
       *GNU* | *'with BFD'*)
 	test no != "$with_gnu_ld" && break
 	;;
       *)
 	test yes != "$with_gnu_ld" && break
 	;;
       esac
     fi
   done
   IFS=$lt_save_ifs
 else
   lt_cv_path_LD=$LD # Let the user override the test with a path.
 fi
 fi
 
 LD=$lt_cv_path_LD
 if test -n "$LD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
 if ${lt_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
   ;;
 *)
   lt_cv_prog_gnu_ld=no
   ;;
 esac
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
 if ${lt_cv_path_NM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM=$NM
 else
   lt_nm_to_check=${ac_tool_prefix}nm
   if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
     lt_nm_to_check="$lt_nm_to_check nm"
   fi
   for lt_tmp_nm in $lt_nm_to_check; do
     lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
     for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
       IFS=$lt_save_ifs
       test -z "$ac_dir" && ac_dir=.
       tmp_nm=$ac_dir/$lt_tmp_nm
       if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
 	# Check to see if the nm accepts a BSD-compat flag.
 	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
 	#   nm: unknown option "B" ignored
 	# Tru64's nm complains that /dev/null is an invalid object file
 	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
 	case $build_os in
 	mingw*) lt_bad_file=conftest.nm/nofile ;;
 	*) lt_bad_file=/dev/null ;;
 	esac
 	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
 	*$lt_bad_file* | *'Invalid file or object type'*)
 	  lt_cv_path_NM="$tmp_nm -B"
 	  break 2
 	  ;;
 	*)
 	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
 	  */dev/null*)
 	    lt_cv_path_NM="$tmp_nm -p"
 	    break 2
 	    ;;
 	  *)
 	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
 	    continue # so that we can try to find one that supports BSD flags
 	    ;;
 	  esac
 	  ;;
 	esac
       fi
     done
     IFS=$lt_save_ifs
   done
   : ${lt_cv_path_NM=no}
 fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
 if test no != "$lt_cv_path_NM"; then
   NM=$lt_cv_path_NM
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
   if test -n "$DUMPBIN"; then :
     # Let the user override the test.
   else
     if test -n "$ac_tool_prefix"; then
   for ac_prog in dumpbin "link -dump"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
   ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
 $as_echo "$DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
     test -n "$DUMPBIN" && break
   done
 fi
 if test -z "$DUMPBIN"; then
   ac_ct_DUMPBIN=$DUMPBIN
   for ac_prog in dumpbin "link -dump"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
   ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
 $as_echo "$ac_ct_DUMPBIN" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$ac_ct_DUMPBIN" && break
 done
 
   if test "x$ac_ct_DUMPBIN" = x; then
     DUMPBIN=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DUMPBIN=$ac_ct_DUMPBIN
   fi
 fi
 
     case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
     *COFF*)
       DUMPBIN="$DUMPBIN -symbols -headers"
       ;;
     *)
       DUMPBIN=:
       ;;
     esac
   fi
 
   if test : != "$DUMPBIN"; then
     NM=$DUMPBIN
   fi
 fi
 test -z "$NM" && NM=nm
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
 if ${lt_cv_nm_interface+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
   (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
   (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
   (eval echo "\"\$as_me:$LINENO: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
   fi
   rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
 if ${lt_cv_sys_max_cmd_len+:} false; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
   teststring=ABCD
 
   case $build_os in
   msdosdjgpp*)
     # On DJGPP, this test can blow up pretty badly due to problems in libc
     # (any single argument exceeding 2000 bytes causes a buffer overrun
     # during glob expansion).  Even if it were fixed, the result of this
     # check would be larger than it should be.
     lt_cv_sys_max_cmd_len=12288;    # 12K is about right
     ;;
 
   gnu*)
     # Under GNU Hurd, this test is not required because there is
     # no limit to the length of command line arguments.
     # Libtool will interpret -1 as no limit whatsoever
     lt_cv_sys_max_cmd_len=-1;
     ;;
 
   cygwin* | mingw* | cegcc*)
     # On Win9x/ME, this test blows up -- it succeeds, but takes
     # about 5 minutes as the teststring grows exponentially.
     # Worse, since 9x/ME are not pre-emptively multitasking,
     # you end up with a "frozen" computer, even though with patience
     # the test eventually succeeds (with a max line length of 256k).
     # Instead, let's just punt: use the minimum linelength reported by
     # all of the supported platforms: 8192 (on NT/2K/XP).
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
   mint*)
     # On MiNT this can take a long time and run out of memory.
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
   bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
     elif test -x /usr/sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
     else
       lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
     fi
     # And add a safety zone
     lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
     lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     ;;
 
   interix*)
     # We know the value 262144 and hardcode it with a safety zone (like BSD)
     lt_cv_sys_max_cmd_len=196608
     ;;
 
   os2*)
     # The test takes a long time on OS/2.
     lt_cv_sys_max_cmd_len=8192
     ;;
 
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
     # nice to cause kernel panics so lets avoid the loop below.
     # First set a reasonable default.
     lt_cv_sys_max_cmd_len=16384
     #
     if test -x /sbin/sysconfig; then
       case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
         *1*) lt_cv_sys_max_cmd_len=-1 ;;
       esac
     fi
     ;;
   sco3.2v5*)
     lt_cv_sys_max_cmd_len=102400
     ;;
   sysv5* | sco5v6* | sysv4.2uw2*)
     kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
     if test -n "$kargmax"; then
       lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[	 ]//'`
     else
       lt_cv_sys_max_cmd_len=32768
     fi
     ;;
   *)
     lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
     if test -n "$lt_cv_sys_max_cmd_len" && \
        test undefined != "$lt_cv_sys_max_cmd_len"; then
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
     else
       # Make teststring a little bigger before we do anything with it.
       # a 1K string should be a reasonable start.
       for i in 1 2 3 4 5 6 7 8; do
         teststring=$teststring$teststring
       done
       SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
       while { test X`env echo "$teststring$teststring" 2>/dev/null` \
 	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test 17 != "$i" # 1/2 MB should be enough
       do
         i=`expr $i + 1`
         teststring=$teststring$teststring
       done
       # Only check the string length outside the loop.
       lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
       teststring=
       # Add a significant safety factor because C++ compilers can tack on
       # massive amounts of additional arguments before passing them to the
       # linker.  It appears as though 1/2 is a usable value.
       lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
     fi
     ;;
   esac
 
 fi
 
 if test -n "$lt_cv_sys_max_cmd_len"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 $as_echo "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
 
 
 
 
 
 
 : ${CP="cp -f"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
 if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
   lt_unset=unset
 else
   lt_unset=false
 fi
 
 
 
 
 
 # test EBCDIC or ASCII
 case `echo X|tr X '\101'` in
  A) # ASCII based system
     # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
   lt_SP2NL='tr \040 \012'
   lt_NL2SP='tr \015\012 \040\040'
   ;;
  *) # EBCDIC based system
   lt_SP2NL='tr \100 \n'
   lt_NL2SP='tr \r\n \100\100'
   ;;
 esac
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
 $as_echo_n "checking how to convert $build file names to $host format... " >&6; }
 if ${lt_cv_to_host_file_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $host in
   *-*-mingw* )
     case $build in
       *-*-mingw* ) # actually msys
         lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
         ;;
       *-*-cygwin* )
         lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
         ;;
       * ) # otherwise, assume *nix
         lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
         ;;
     esac
     ;;
   *-*-cygwin* )
     case $build in
       *-*-mingw* ) # actually msys
         lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
         ;;
       *-*-cygwin* )
         lt_cv_to_host_file_cmd=func_convert_file_noop
         ;;
       * ) # otherwise, assume *nix
         lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
         ;;
     esac
     ;;
   * ) # unhandled hosts (and "normal" native builds)
     lt_cv_to_host_file_cmd=func_convert_file_noop
     ;;
 esac
 
 fi
 
 to_host_file_cmd=$lt_cv_to_host_file_cmd
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
 $as_echo "$lt_cv_to_host_file_cmd" >&6; }
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
 $as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
 if ${lt_cv_to_tool_file_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   #assume ordinary cross tools, or native build.
 lt_cv_to_tool_file_cmd=func_convert_file_noop
 case $host in
   *-*-mingw* )
     case $build in
       *-*-mingw* ) # actually msys
         lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
         ;;
     esac
     ;;
 esac
 
 fi
 
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
 $as_echo "$lt_cv_to_tool_file_cmd" >&6; }
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
 if ${lt_cv_ld_reload_flag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
 $as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
 *) reload_flag=" $reload_flag" ;;
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
     if test yes != "$GCC"; then
       reload_cmds=false
     fi
     ;;
   darwin*)
     if test yes = "$GCC"; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
     else
       reload_cmds='$LD$reload_flag -o $output$reload_objs'
     fi
     ;;
 esac
 
 
 
 
 
 
 
 
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
   ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_OBJDUMP"; then
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
   ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OBJDUMP" = x; then
     OBJDUMP="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OBJDUMP=$ac_ct_OBJDUMP
   fi
 else
   OBJDUMP="$ac_cv_prog_OBJDUMP"
 fi
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
 if ${lt_cv_deplibs_check_method+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support
 # interlibrary dependencies.
 # 'none' -- dependencies not supported.
 # 'unknown' -- same as none, but documents that we really don't know.
 # 'pass_all' -- all dependencies passed with no checks.
 # 'test_compile' -- check by making test program.
 # 'file_magic [[regex]]' -- check by looking for files in library path
 # that responds to the $file_magic_cmd with a given extended regex.
 # If you have 'file' or equivalent on your system and you're not sure
 # whether 'pass_all' will *always* work, you probably want this one.
 
 case $host_os in
 aix[4-9]*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 beos*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 bsdi[45]*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
   lt_cv_file_magic_cmd='/usr/bin/file -L'
   lt_cv_file_magic_test_file=/shlib/libc.so
   ;;
 
 cygwin*)
   # func_win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
   lt_cv_file_magic_cmd='func_win32_libid'
   ;;
 
 mingw* | pw32*)
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
   if ( file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
     # Keep this pattern in sync with the one in func_win32_libid.
     lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
 cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
   ;;
 
 darwin* | rhapsody*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 freebsd* | dragonfly*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
       # Not sure whether the presence of OpenBSD here was a mistake.
       # Let's accept both of them until this is cleared up.
       lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library'
       lt_cv_file_magic_cmd=/usr/bin/file
       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
       ;;
     esac
   else
     lt_cv_deplibs_check_method=pass_all
   fi
   ;;
 
 haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 hpux10.20* | hpux11*)
   lt_cv_file_magic_cmd=/usr/bin/file
   case $host_cpu in
   ia64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
     lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
   ;;
 
 interix[3-9]*)
   # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
   lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
   ;;
 
 irix5* | irix6* | nonstopux*)
   case $LD in
   *-32|*"-32 ") libmagic=32-bit;;
   *-n32|*"-n32 ") libmagic=N32;;
   *-64|*"-64 ") libmagic=64-bit;;
   *) libmagic=never-match;;
   esac
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 # This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 netbsd*)
   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
   fi
   ;;
 
 newos6*)
   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
   lt_cv_file_magic_cmd=/usr/bin/file
   lt_cv_file_magic_test_file=/usr/lib/libnls.so
   ;;
 
 *nto* | *qnx*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 openbsd* | bitrig*)
   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
   else
     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
   fi
   ;;
 
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 rdos*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 solaris*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
 sysv4 | sysv4.3*)
   case $host_vendor in
   motorola)
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
     lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
     ;;
   ncr)
     lt_cv_deplibs_check_method=pass_all
     ;;
   sequent)
     lt_cv_file_magic_cmd='/bin/file'
     lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
     ;;
   sni)
     lt_cv_file_magic_cmd='/bin/file'
     lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
     lt_cv_file_magic_test_file=/lib/libc.so
     ;;
   siemens)
     lt_cv_deplibs_check_method=pass_all
     ;;
   pc)
     lt_cv_deplibs_check_method=pass_all
     ;;
   esac
   ;;
 
 tpf*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 os2*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
 
 file_magic_glob=
 want_nocaseglob=no
 if test "$build" = "$host"; then
   case $host_os in
   mingw* | pw32*)
     if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
       want_nocaseglob=yes
     else
       file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
     fi
     ;;
   esac
 fi
 
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
   ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
 $as_echo "$DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_DLLTOOL"; then
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
   ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
 $as_echo "$ac_ct_DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DLLTOOL" = x; then
     DLLTOOL="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DLLTOOL=$ac_ct_DLLTOOL
   fi
 else
   DLLTOOL="$ac_cv_prog_DLLTOOL"
 fi
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
 
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
 $as_echo_n "checking how to associate runtime and link libraries... " >&6; }
 if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_sharedlib_from_linklib_cmd='unknown'
 
 case $host_os in
 cygwin* | mingw* | pw32* | cegcc*)
   # two different shell functions defined in ltmain.sh;
   # decide which one to use based on capabilities of $DLLTOOL
   case `$DLLTOOL --help 2>&1` in
   *--identify-strict*)
     lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
     ;;
   *)
     lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
     ;;
   esac
   ;;
 *)
   # fallback: assume linklib IS sharedlib
   lt_cv_sharedlib_from_linklib_cmd=$ECHO
   ;;
 esac
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
 $as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
 sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
 test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
 
 
 
 
 
 
 
 if test -n "$ac_tool_prefix"; then
   for ac_prog in ar
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
     test -n "$AR" && break
   done
 fi
 if test -z "$AR"; then
   ac_ct_AR=$AR
   for ac_prog in ar
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   test -n "$ac_ct_AR" && break
 done
 
   if test "x$ac_ct_AR" = x; then
     AR="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
   fi
 fi
 
 : ${AR=ar}
 : ${AR_FLAGS=cru}
 
 
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
 $as_echo_n "checking for archiver @FILE support... " >&6; }
 if ${lt_cv_ar_at_file+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ar_at_file=no
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
   echo conftest.$ac_objext > conftest.lst
       lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
       { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
       if test 0 -eq "$ac_status"; then
 	# Ensure the archiver fails upon bogus file names.
 	rm -f conftest.$ac_objext libconftest.a
 	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
   (eval $lt_ar_try) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	if test 0 -ne "$ac_status"; then
           lt_cv_ar_at_file=@
         fi
       fi
       rm -f conftest.* libconftest.a
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
 $as_echo "$lt_cv_ar_at_file" >&6; }
 
 if test no = "$lt_cv_ar_at_file"; then
   archiver_list_spec=
 else
   archiver_list_spec=$lt_cv_ar_at_file
 fi
 
 
 
 
 
 
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
     STRIP=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
   fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
 
 test -z "$STRIP" && STRIP=:
 
 
 
 
 
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
     RANLIB=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
   fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
 test -z "$RANLIB" && RANLIB=:
 
 
 
 
 
 
 # Determine commands to create old-style static archives.
 old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 old_postinstall_cmds='chmod 644 $oldlib'
 old_postuninstall_cmds=
 
 if test -n "$RANLIB"; then
   case $host_os in
   bitrig* | openbsd*)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
     old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
   darwin*)
     lock_old_archive_extraction=yes ;;
   *)
     lock_old_archive_extraction=no ;;
 esac
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
 # If no C compiler flags were specified, use CFLAGS.
 LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
 if ${lt_cv_sys_global_symbol_pipe+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
 # These are sane defaults that work on at least a few old systems.
 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
 # Character class describing NM global symbol codes.
 symcode='[BCDEGRST]'
 
 # Regexp to match symbols that can be accessed directly from C.
 sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
 # Define system-specific variables.
 case $host_os in
 aix*)
   symcode='[BCDT]'
   ;;
 cygwin* | mingw* | pw32* | cegcc*)
   symcode='[ABCDGISTW]'
   ;;
 hpux*)
   if test ia64 = "$host_cpu"; then
     symcode='[ABCDEGRST]'
   fi
   ;;
 irix* | nonstopux*)
   symcode='[BCDEGRST]'
   ;;
 osf*)
   symcode='[BCDEGQRST]'
   ;;
 solaris*)
   symcode='[BDRT]'
   ;;
 sco3.2v5*)
   symcode='[DT]'
   ;;
 sysv4.2uw2*)
   symcode='[DT]'
   ;;
 sysv5* | sco5v6* | unixware* | OpenUNIX*)
   symcode='[ABDT]'
   ;;
 sysv4)
   symcode='[DFNSTU]'
   ;;
 esac
 
 # If we're using GNU nm, then use its standard symbol codes.
 case `$NM -V 2>&1` in
 *GNU* | *'with BFD'*)
   symcode='[ABCDGIRSTW]' ;;
 esac
 
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   # Gets list of data symbols to import.
   lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
   # Adjust the below global symbol transforms to fixup imported variables.
   lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
   lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
   lt_c_name_lib_hook="\
   -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
   -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
 else
   # Disable hooks by default.
   lt_cv_sys_global_symbol_to_import=
   lt_cdecl_hook=
   lt_c_name_hook=
   lt_c_name_lib_hook=
 fi
 
 # Transform an extracted symbol line into a proper C declaration.
 # Some systems (esp. on ia64) link data and code symbols differently,
 # so use this general approach.
 lt_cv_sys_global_symbol_to_cdecl="sed -n"\
 $lt_cdecl_hook\
 " -e 's/^T .* \(.*\)$/extern int \1();/p'"\
 " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
 lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
 $lt_c_name_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
 
 # Transform an extracted symbol line into symbol name with lib prefix and
 # symbol address.
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
 $lt_c_name_lib_hook\
 " -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
 " -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
 " -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
 case $build_os in
 mingw*)
   opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
   ;;
 esac
 
 # Try without a prefix underscore, then with it.
 for ac_symprfx in "" "_"; do
 
   # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
   symxfrm="\\1 $ac_symprfx\\2 \\2"
 
   # Write the raw and C identifiers.
   if test "$lt_cv_nm_interface" = "MS dumpbin"; then
     # Fake it for dumpbin and say T for any non-static function,
     # D for any global variable and I for any imported variable.
     # Also find C++ and __fastcall symbols from MSVC++,
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
 "     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
 "     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
 "     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
 "     {if(hide[section]) next};"\
 "     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
 "     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
 "     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
 "     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
 "     ' prfx=^$ac_symprfx"
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
   lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
 
   rm -f conftest*
   cat > conftest.$ac_ext <<_LT_EOF
 #ifdef __cplusplus
 extern "C" {
 #endif
 char nm_test_var;
 void nm_test_func(void);
 void nm_test_func(void){}
 #ifdef __cplusplus
 }
 #endif
 int main(){nm_test_var='a';nm_test_func();return(0);}
 _LT_EOF
 
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
       else
 	rm -f "$nlist"T
       fi
 
       # Make sure that we snagged all the symbols we need.
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
 /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
 #if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
 /* DATA imports from DLLs on WIN32 can't be const, because runtime
    relocations are performed -- see ld's documentation on pseudo-relocs.  */
 # define LT_DLSYM_CONST
 #elif defined __osf__
 /* This system does not cope well with relocations in const data.  */
 # define LT_DLSYM_CONST
 #else
 # define LT_DLSYM_CONST const
 #endif
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 _LT_EOF
 	  # Now generate the symbol file.
 	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
 
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
 LT_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
 lt__PROGRAM__LTX_preloaded_symbols[] =
 {
   { "@PROGRAM@", (void *) 0 },
 _LT_EOF
 	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
 	  cat <<\_LT_EOF >> conftest.$ac_ext
   {0, (void *) 0}
 };
 
 /* This works around a problem in FreeBSD linker */
 #ifdef FREEBSD_WORKAROUND
 static const void *lt_preloaded_setup() {
   return lt__PROGRAM__LTX_preloaded_symbols;
 }
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
 	  lt_globsym_save_LIBS=$LIBS
 	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS=conftstm.$ac_objext
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
 	  LIBS=$lt_globsym_save_LIBS
 	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
       else
 	echo "cannot find nm_test_var in $nlist" >&5
       fi
     else
       echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
     fi
   else
     echo "$progname: failed program was:" >&5
     cat conftest.$ac_ext >&5
   fi
   rm -rf conftest* conftst*
 
   # Do not use the global_symbol_pipe unless it works.
   if test yes = "$pipe_works"; then
     break
   else
     lt_cv_sys_global_symbol_pipe=
   fi
 done
 
 fi
 
 if test -z "$lt_cv_sys_global_symbol_pipe"; then
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
 $as_echo "failed" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
 fi
 
 # Response file support.
 if test "$lt_cv_nm_interface" = "MS dumpbin"; then
   nm_file_list_spec='@'
 elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
   nm_file_list_spec='@'
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
 $as_echo_n "checking for sysroot... " >&6; }
 
 # Check whether --with-sysroot was given.
 if test "${with_sysroot+set}" = set; then :
   withval=$with_sysroot;
 else
   with_sysroot=no
 fi
 
 
 lt_sysroot=
 case $with_sysroot in #(
  yes)
    if test yes = "$GCC"; then
      lt_sysroot=`$CC --print-sysroot 2>/dev/null`
    fi
    ;; #(
  /*)
    lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
    ;; #(
  no|'')
    ;; #(
  *)
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5
 $as_echo "$with_sysroot" >&6; }
    as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
    ;;
 esac
 
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
 $as_echo "${lt_sysroot:-no}" >&6; }
 
 
 
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
 $as_echo_n "checking for a working dd... " >&6; }
 if ${ac_cv_path_lt_DD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 : ${lt_DD:=$DD}
 if test -z "$lt_DD"; then
   ac_path_lt_DD_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_prog in dd; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_lt_DD" || continue
 if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
   cmp -s conftest.i conftest.out \
   && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
 fi
       $ac_path_lt_DD_found && break 3
     done
   done
   done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_lt_DD"; then
     :
   fi
 else
   ac_cv_path_lt_DD=$lt_DD
 fi
 
 rm -f conftest.i conftest2.i conftest.out
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
 $as_echo "$ac_cv_path_lt_DD" >&6; }
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
 $as_echo_n "checking how to truncate binary pipes... " >&6; }
 if ${lt_cv_truncate_bin+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   printf 0123456789abcdef0123456789abcdef >conftest.i
 cat conftest.i conftest.i >conftest2.i
 lt_cv_truncate_bin=
 if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
   cmp -s conftest.i conftest.out \
   && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
 fi
 rm -f conftest.i conftest2.i conftest.out
 test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
 $as_echo "$lt_cv_truncate_bin" >&6; }
 
 
 
 
 
 
 
 # Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
 func_cc_basename ()
 {
     for cc_temp in $*""; do
       case $cc_temp in
         compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
         distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
         \-*) ;;
         *) break;;
       esac
     done
     func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 }
 
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
 test no = "$enable_libtool_lock" || enable_libtool_lock=yes
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
 case $host in
 ia64-*-hpux*)
   # Find out what ABI is being produced by ac_compile, and set mode
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE=32
 	;;
       *ELF-64*)
 	HPUX_IA64_MODE=64
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 *-*-irix6*)
   # Find out what ABI is being produced by ac_compile, and set linker
   # options accordingly.
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     if test yes = "$lt_cv_prog_gnu_ld"; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -melf32bsmip"
 	  ;;
 	*N32*)
 	  LD="${LD-ld} -melf32bmipn32"
 	  ;;
 	*64-bit*)
 	  LD="${LD-ld} -melf64bmip"
 	;;
       esac
     else
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
 	  LD="${LD-ld} -32"
 	  ;;
 	*N32*)
 	  LD="${LD-ld} -n32"
 	  ;;
 	*64-bit*)
 	  LD="${LD-ld} -64"
 	  ;;
       esac
     fi
   fi
   rm -rf conftest*
   ;;
 
 mips64*-*linux*)
   # Find out what ABI is being produced by ac_compile, and set linker
   # options accordingly.
   echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     emul=elf
     case `/usr/bin/file conftest.$ac_objext` in
       *32-bit*)
 	emul="${emul}32"
 	;;
       *64-bit*)
 	emul="${emul}64"
 	;;
     esac
     case `/usr/bin/file conftest.$ac_objext` in
       *MSB*)
 	emul="${emul}btsmip"
 	;;
       *LSB*)
 	emul="${emul}ltsmip"
 	;;
     esac
     case `/usr/bin/file conftest.$ac_objext` in
       *N32*)
 	emul="${emul}n32"
 	;;
     esac
     LD="${LD-ld} -m $emul"
   fi
   rm -rf conftest*
   ;;
 
 x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out what ABI is being produced by ac_compile, and set linker
   # options accordingly.  Note that the listed cases only cover the
   # situations where additional linker options are needed (such as when
   # doing 32-bit compilation for a host where ld defaults to 64-bit, or
   # vice versa); the common cases where no linker options are needed do
   # not appear in the list.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
       *32-bit*)
 	case $host in
 	  x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
 	  x86_64-*linux*)
 	    case `/usr/bin/file conftest.o` in
 	      *x86-64*)
 		LD="${LD-ld} -m elf32_x86_64"
 		;;
 	      *)
 		LD="${LD-ld} -m elf_i386"
 		;;
 	    esac
 	    ;;
 	  powerpc64le-*linux*)
 	    LD="${LD-ld} -m elf32lppclinux"
 	    ;;
 	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
 	    LD="${LD-ld} -m elf_s390"
 	    ;;
 	  sparc64-*linux*)
 	    LD="${LD-ld} -m elf32_sparc"
 	    ;;
 	esac
 	;;
       *64-bit*)
 	case $host in
 	  x86_64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_x86_64_fbsd"
 	    ;;
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
 	  powerpcle-*linux*)
 	    LD="${LD-ld} -m elf64lppc"
 	    ;;
 	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
 	    LD="${LD-ld} -m elf64_s390"
 	    ;;
 	  sparc*-*linux*)
 	    LD="${LD-ld} -m elf64_sparc"
 	    ;;
 	esac
 	;;
     esac
   fi
   rm -rf conftest*
   ;;
 
 *-*-sco3.2v5*)
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
 if ${lt_cv_cc_needs_belf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_cc_needs_belf=yes
 else
   lt_cv_cc_needs_belf=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test yes != "$lt_cv_cc_needs_belf"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
     CFLAGS=$SAVE_CFLAGS
   fi
   ;;
 *-*solaris*)
   # Find out what ABI is being produced by ac_compile, and set linker
   # options accordingly.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
       yes*)
         case $host in
         i?86-*-solaris*|x86_64-*-solaris*)
           LD="${LD-ld} -m elf_x86_64"
           ;;
         sparc*-*-solaris*)
           LD="${LD-ld} -m elf64_sparc"
           ;;
         esac
         # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
         if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
           LD=${LD-ld}_sol2
         fi
         ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
 	fi
 	;;
       esac
       ;;
     esac
   fi
   rm -rf conftest*
   ;;
 esac
 
 need_locks=$enable_libtool_lock
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$MANIFEST_TOOL"; then
   ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
 if test -n "$MANIFEST_TOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
 $as_echo "$MANIFEST_TOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
   ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
   # Extract the first word of "mt", so it can be a program name with args.
 set dummy mt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_MANIFEST_TOOL"; then
   ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
 if test -n "$ac_ct_MANIFEST_TOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
 $as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_MANIFEST_TOOL" = x; then
     MANIFEST_TOOL=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
   fi
 else
   MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
 fi
 
 test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
 $as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
 if ${lt_cv_path_mainfest_tool+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_path_mainfest_tool=no
   echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
   $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
   cat conftest.err >&5
   if $GREP 'Manifest Tool' conftest.out > /dev/null; then
     lt_cv_path_mainfest_tool=yes
   fi
   rm -f conftest*
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
 $as_echo "$lt_cv_path_mainfest_tool" >&6; }
 if test yes != "$lt_cv_path_mainfest_tool"; then
   MANIFEST_TOOL=:
 fi
 
 
 
 
 
 
   case $host_os in
     rhapsody* | darwin*)
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_DSYMUTIL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
 $as_echo "$DSYMUTIL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_DSYMUTIL"; then
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
 $as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
     DSYMUTIL=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
   fi
 else
   DSYMUTIL="$ac_cv_prog_DSYMUTIL"
 fi
 
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_NMEDIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
 $as_echo "$NMEDIT" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_NMEDIT"; then
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
 $as_echo "$ac_ct_NMEDIT" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
     NMEDIT=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
   fi
 else
   NMEDIT="$ac_cv_prog_NMEDIT"
 fi
 
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
   ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
 $as_echo "$LIPO" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_LIPO"; then
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
   ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
 $as_echo "$ac_ct_LIPO" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_LIPO" = x; then
     LIPO=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     LIPO=$ac_ct_LIPO
   fi
 else
   LIPO="$ac_cv_prog_LIPO"
 fi
 
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
   ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
 $as_echo "$OTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_OTOOL"; then
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
   ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
 $as_echo "$ac_ct_OTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL" = x; then
     OTOOL=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL=$ac_ct_OTOOL
   fi
 else
   OTOOL="$ac_cv_prog_OTOOL"
 fi
 
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
   ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
 $as_echo "$OTOOL64" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 fi
 if test -z "$ac_cv_prog_OTOOL64"; then
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
 if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
   ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
 $as_echo "$ac_ct_OTOOL64" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_OTOOL64" = x; then
     OTOOL64=":"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     OTOOL64=$ac_ct_OTOOL64
   fi
 else
   OTOOL64="$ac_cv_prog_OTOOL64"
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
 if ${lt_cv_apple_cc_single_mod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
       if test -z "$LT_MULTI_MODULE"; then
 	# By default we will add the -single_module flag. You can override
 	# by either setting the environment variable LT_MULTI_MODULE
 	# non-empty at configure time, or by adding -multi_module to the
 	# link flags.
 	rm -rf libconftest.dylib*
 	echo "int foo(void){return 1;}" > conftest.c
 	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 -dynamiclib -Wl,-single_module conftest.c" >&5
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
 	# If there is a non-empty error log, and "single_module"
 	# appears in it, assume the flag caused a linker warning
         if test -s conftest.err && $GREP single_module conftest.err; then
 	  cat conftest.err >&5
 	# Otherwise, if the output was created with a 0 exit code from
 	# the compiler, it worked.
 	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
 	fi
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_ld_exported_symbols_list=yes
 else
   lt_cv_ld_exported_symbols_list=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
 int forced_loaded() { return 2;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
       $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
       echo "$AR cru libconftest.a conftest.o" >&5
       $AR cru libconftest.a conftest.o 2>&5
       echo "$RANLIB libconftest.a" >&5
       $RANLIB libconftest.a 2>&5
       cat > conftest.c << _LT_EOF
 int main() { return 0;}
 _LT_EOF
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
       if test -s conftest.err && $GREP force_load conftest.err; then
 	cat conftest.err >&5
       elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
       fi
         rm -f conftest.err libconftest.a conftest conftest.c
         rm -rf conftest.dSYM
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
 $as_echo "$lt_cv_ld_force_load" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
     darwin1.*)
       _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
     darwin*) # darwin 5.x on
       # if running on 10.5 or later, the deployment target defaults
       # to the OS version, if on x86, and 10.4, the deployment
       # target defaults to 10.4. Don't you love it?
       case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
 	10.0,*86*-darwin8*|10.0,*-darwin[91]*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
 	10.[012][,.]*)
 	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
 	10.*)
 	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
       esac
     ;;
   esac
     if test yes = "$lt_cv_apple_cc_single_mod"; then
       _lt_dar_single_mod='$single_module'
     fi
     if test yes = "$lt_cv_ld_exported_symbols_list"; then
       _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
     fi
     if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
     fi
     ;;
   esac
 
 # func_munge_path_list VARIABLE PATH
 # -----------------------------------
 # VARIABLE is name of variable containing _space_ separated list of
 # directories to be munged by the contents of PATH, which is string
 # having a format:
 # "DIR[:DIR]:"
 #       string "DIR[ DIR]" will be prepended to VARIABLE
 # ":DIR[:DIR]"
 #       string "DIR[ DIR]" will be appended to VARIABLE
 # "DIRP[:DIRP]::[DIRA:]DIRA"
 #       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
 #       "DIRA[ DIRA]" will be appended to VARIABLE
 # "DIR[:DIR]"
 #       VARIABLE will be replaced by "DIR[ DIR]"
 func_munge_path_list ()
 {
     case x$2 in
     x)
         ;;
     *:)
         eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
         ;;
     x:*)
         eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
         ;;
     *::*)
         eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
         eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
         ;;
     *)
         eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
         ;;
     esac
 }
 
 for ac_header in dlfcn.h
 do :
   ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
 "
 if test "x$ac_cv_header_dlfcn_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DLFCN_H 1
 _ACEOF
 
 fi
 
 done
 
 
 
 
 
 # Set options
 # Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then :
   enableval=$enable_static; p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
     no) enable_static=no ;;
     *)
      enable_static=no
       # Look at the argument we got.  We use all the common list separators.
       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
 	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_static=yes
 	fi
       done
       IFS=$lt_save_ifs
       ;;
     esac
 else
   enable_static=no
 fi
 
 
 
 
 
 
 
 enable_dlopen=yes
 
 
 
 
   enable_win32_dll=no
 
 
             # Check whether --enable-shared was given.
 if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
     no) enable_shared=no ;;
     *)
       enable_shared=no
       # Look at the argument we got.  We use all the common list separators.
       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
 	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_shared=yes
 	fi
       done
       IFS=$lt_save_ifs
       ;;
     esac
 else
   enable_shared=yes
 fi
 
 
 
 
 
 
 
 
 
 
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
   withval=$with_pic; lt_p=${PACKAGE-default}
     case $withval in
     yes|no) pic_mode=$withval ;;
     *)
       pic_mode=default
       # Look at the argument we got.  We use all the common list separators.
       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for lt_pkg in $withval; do
 	IFS=$lt_save_ifs
 	if test "X$lt_pkg" = "X$lt_p"; then
 	  pic_mode=yes
 	fi
       done
       IFS=$lt_save_ifs
       ;;
     esac
 else
   pic_mode=default
 fi
 
 
 
 
 
 
 
 
   # Check whether --enable-fast-install was given.
 if test "${enable_fast_install+set}" = set; then :
   enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
     no) enable_fast_install=no ;;
     *)
       enable_fast_install=no
       # Look at the argument we got.  We use all the common list separators.
       lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
       for pkg in $enableval; do
 	IFS=$lt_save_ifs
 	if test "X$pkg" = "X$p"; then
 	  enable_fast_install=yes
 	fi
       done
       IFS=$lt_save_ifs
       ;;
     esac
 else
   enable_fast_install=yes
 fi
 
 
 
 
 
 
 
 
   shared_archive_member_spec=
 case $host,$enable_shared in
 power*-*-aix[5-9]*,yes)
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5
 $as_echo_n "checking which variant of shared library versioning to provide... " >&6; }
 
 # Check whether --with-aix-soname was given.
 if test "${with_aix_soname+set}" = set; then :
   withval=$with_aix_soname; case $withval in
     aix|svr4|both)
       ;;
     *)
       as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5
       ;;
     esac
     lt_cv_with_aix_soname=$with_aix_soname
 else
   if ${lt_cv_with_aix_soname+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_with_aix_soname=aix
 fi
 
     with_aix_soname=$lt_cv_with_aix_soname
 fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5
 $as_echo "$with_aix_soname" >&6; }
   if test aix != "$with_aix_soname"; then
     # For the AIX way of multilib, we name the shared archive member
     # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
     # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
     # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
     # the AIX toolchain works better with OBJECT_MODE set (default 32).
     if test 64 = "${OBJECT_MODE-32}"; then
       shared_archive_member_spec=shr_64
     else
       shared_archive_member_spec=shr
     fi
   fi
   ;;
 *)
   with_aix_soname=aix
   ;;
 esac
 
 
 
 
 
 
 
 
 
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS=$ltmain
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 test -z "$LN_S" && LN_S="ln -s"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 if test -n "${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
 if ${lt_cv_objdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
   lt_cv_objdir=.libs
 else
   # MS-DOS does not allow filenames that begin with a dot.
   lt_cv_objdir=_libs
 fi
 rmdir .libs 2>/dev/null
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
 $as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
 
 
 
 cat >>confdefs.h <<_ACEOF
 #define LT_OBJDIR "$lt_cv_objdir/"
 _ACEOF
 
 
 
 
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
   # reason, if we set the COLLECT_NAMES environment variable, the problems
   # vanish in a puff of smoke.
   if test set != "${COLLECT_NAMES+set}"; then
     COLLECT_NAMES=
     export COLLECT_NAMES
   fi
   ;;
 esac
 
 # Global variables:
 ofile=libtool
 can_build_shared=yes
 
 # All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 old_CC=$CC
 old_CFLAGS=$CFLAGS
 
 # Set sane defaults for various variables
 test -z "$CC" && CC=cc
 test -z "$LTCC" && LTCC=$CC
 test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
 test -z "$LD" && LD=ld
 test -z "$ac_objext" && ac_objext=o
 
 func_cc_basename $compiler
 cc_basename=$func_cc_basename_result
 
 
 # Only perform the check for file, if the check method requires it
 test -z "$MAGIC_CMD" && MAGIC_CMD=file
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
 if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
   lt_save_MAGIC_CMD=$MAGIC_CMD
   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
     IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/${ac_tool_prefix}file"; then
       lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
 	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
 *** The result is that libtool may fail to recognize shared libraries
 *** as such.  This will affect the creation of libtool libraries that
 *** depend on shared libraries, but programs linked with such libtool
 *** libraries will work regardless of this problem.  Nevertheless, you
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
 _LT_EOF
 	  fi ;;
 	esac
       fi
       break
     fi
   done
   IFS=$lt_save_ifs
   MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 
 
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
 if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
   lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
   ;;
 *)
   lt_save_MAGIC_CMD=$MAGIC_CMD
   lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
   ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
   for ac_dir in $ac_dummy; do
     IFS=$lt_save_ifs
     test -z "$ac_dir" && ac_dir=.
     if test -f "$ac_dir/file"; then
       lt_cv_path_MAGIC_CMD=$ac_dir/"file"
       if test -n "$file_magic_test_file"; then
 	case $deplibs_check_method in
 	"file_magic "*)
 	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
 	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
 	    $EGREP "$file_magic_regex" > /dev/null; then
 	    :
 	  else
 	    cat <<_LT_EOF 1>&2
 
 *** Warning: the command libtool uses to detect shared libraries,
 *** $file_magic_cmd, produces output that libtool cannot recognize.
 *** The result is that libtool may fail to recognize shared libraries
 *** as such.  This will affect the creation of libtool libraries that
 *** depend on shared libraries, but programs linked with such libtool
 *** libraries will work regardless of this problem.  Nevertheless, you
 *** may want to report the problem to your system manager and/or to
 *** bug-libtool@gnu.org
 
 _LT_EOF
 	  fi ;;
 	esac
       fi
       break
     fi
   done
   IFS=$lt_save_ifs
   MAGIC_CMD=$lt_save_MAGIC_CMD
   ;;
 esac
 fi
 
 MAGIC_CMD=$lt_cv_path_MAGIC_CMD
 if test -n "$MAGIC_CMD"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
   else
     MAGIC_CMD=:
   fi
 fi
 
   fi
   ;;
 esac
 
 # Use C for the default configuration in the libtool script
 
 lt_save_CC=$CC
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # Source file extension for C test sources.
 ac_ext=c
 
 # Object file extension for compiled C test sources.
 objext=o
 objext=$objext
 
 # Code to be used in simple compile tests
 lt_simple_compile_test_code="int some_variable = 0;"
 
 # Code to be used in simple link tests
 lt_simple_link_test_code='int main(){return(0);}'
 
 
 
 
 
 
 
 # If no C compiler was specified, use CC.
 LTCC=${LTCC-"$CC"}
 
 # If no C compiler flags were specified, use CFLAGS.
 LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
 
 # Allow CC to be a program name with arguments.
 compiler=$CC
 
 # Save the default compiler, since it gets overwritten when the other
 # tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
 compiler_DEFAULT=$CC
 
 # save warnings/boilerplate of simple test code
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_compiler_boilerplate=`cat conftest.err`
 $RM conftest*
 
 ac_outfile=conftest.$ac_objext
 echo "$lt_simple_link_test_code" >conftest.$ac_ext
 eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 _lt_linker_boilerplate=`cat conftest.err`
 $RM -r conftest*
 
 
 ## CAVEAT EMPTOR:
 ## There is no encapsulation within the following macros, do not change
 ## the running order or otherwise move them around unless you know exactly
 ## what you are doing...
 if test -n "$compiler"; then
 
 lt_prog_compiler_no_builtin_flag=
 
 if test yes = "$GCC"; then
   case $cc_basename in
   nvcc*)
     lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
   *)
     lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
   esac
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
 if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
      fi
    fi
    $RM conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then
     lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
 else
     :
 fi
 
 fi
 
 
 
 
 
 
   lt_prog_compiler_wl=
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
 
   if test yes = "$GCC"; then
     lt_prog_compiler_wl='-Wl,'
     lt_prog_compiler_static='-static'
 
     case $host_os in
       aix*)
       # All AIX code is PIC.
       if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       fi
       lt_prog_compiler_pic='-fPIC'
       ;;
 
     amigaos*)
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
             lt_prog_compiler_pic='-fPIC'
         ;;
       m68k)
             # FIXME: we need at least 68020 code to build shared libraries, but
             # adding the '-m68020' flag to GCC prevents building anything better,
             # like '-m68040'.
             lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
         ;;
       esac
       ;;
 
     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
       # PIC is the default for these OSes.
       ;;
 
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       # Although the cygwin gcc ignores -fPIC, still need this for old-style
       # (--disable-auto-import) libraries
       lt_prog_compiler_pic='-DDLL_EXPORT'
       case $host_os in
       os2*)
 	lt_prog_compiler_static='$wl-static'
 	;;
       esac
       ;;
 
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic='-fno-common'
       ;;
 
     haiku*)
       # PIC is the default for Haiku.
       # The "-static" flag exists, but is broken.
       lt_prog_compiler_static=
       ;;
 
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
       # sets the default TLS model and affects inlining.
       case $host_cpu in
       hppa*64*)
 	# +Z the default
 	;;
       *)
 	lt_prog_compiler_pic='-fPIC'
 	;;
       esac
       ;;
 
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
       ;;
 
     msdosdjgpp*)
       # Just because we use GCC doesn't mean we suddenly get shared libraries
       # on systems that don't support them.
       lt_prog_compiler_can_build_shared=no
       enable_shared=no
       ;;
 
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
       lt_prog_compiler_pic='-fPIC -shared'
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec; then
 	lt_prog_compiler_pic=-Kconform_pic
       fi
       ;;
 
     *)
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
 
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
       if test -n "$lt_prog_compiler_pic"; then
         lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
       fi
       ;;
     esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
     aix*)
       lt_prog_compiler_wl='-Wl,'
       if test ia64 = "$host_cpu"; then
 	# AIX 5 now supports IA64 processor
 	lt_prog_compiler_static='-Bstatic'
       else
 	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
       fi
       ;;
 
     darwin* | rhapsody*)
       # PIC is the default on this platform
       # Common symbols not allowed in MH_DYLIB files
       lt_prog_compiler_pic='-fno-common'
       case $cc_basename in
       nagfor*)
         # NAG Fortran compiler
         lt_prog_compiler_wl='-Wl,-Wl,,'
         lt_prog_compiler_pic='-PIC'
         lt_prog_compiler_static='-Bstatic'
         ;;
       esac
       ;;
 
     mingw* | cygwin* | pw32* | os2* | cegcc*)
       # This hack is so that the source file can tell whether it is being
       # built for inclusion in a dll (and should export symbols for example).
       lt_prog_compiler_pic='-DDLL_EXPORT'
       case $host_os in
       os2*)
 	lt_prog_compiler_static='$wl-static'
 	;;
       esac
       ;;
 
     hpux9* | hpux10* | hpux11*)
       lt_prog_compiler_wl='-Wl,'
       # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
       # not for PA HP-UX.
       case $host_cpu in
       hppa*64*|ia64*)
 	# +Z the default
 	;;
       *)
 	lt_prog_compiler_pic='+Z'
 	;;
       esac
       # Is there a better lt_prog_compiler_static that works with the bundled CC?
       lt_prog_compiler_static='$wl-a ${wl}archive'
       ;;
 
     irix5* | irix6* | nonstopux*)
       lt_prog_compiler_wl='-Wl,'
       # PIC (with -KPIC) is the default.
       lt_prog_compiler_static='-non_shared'
       ;;
 
     linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64, which still supported -KPIC.
       ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
 	lt_prog_compiler_static='-static'
         ;;
       # icc used to be incompatible with GCC.
       # ICC 10 doesn't accept -KPIC any more.
       icc* | ifort*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
         ;;
       # Lahey Fortran 8.1.
       lf95*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
       nagfor*)
 	# NAG Fortran compiler
 	lt_prog_compiler_wl='-Wl,-Wl,,'
 	lt_prog_compiler_pic='-PIC'
 	lt_prog_compiler_static='-Bstatic'
 	;;
       tcc*)
 	# Fabrice Bellard et al's Tiny C Compiler
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fPIC'
 	lt_prog_compiler_static='-static'
 	;;
       pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-fpic'
 	lt_prog_compiler_static='-Bstatic'
         ;;
       ccc*)
         lt_prog_compiler_wl='-Wl,'
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
       xl* | bgxl* | bgf* | mpixl*)
 	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
 	*Sun\ F* | *Sun*Fortran*)
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Qoption ld '
 	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
         *Intel*\ [CF]*Compiler*)
 	  lt_prog_compiler_wl='-Wl,'
 	  lt_prog_compiler_pic='-fPIC'
 	  lt_prog_compiler_static='-static'
 	  ;;
 	*Portland\ Group*)
 	  lt_prog_compiler_wl='-Wl,'
 	  lt_prog_compiler_pic='-fpic'
 	  lt_prog_compiler_static='-Bstatic'
 	  ;;
 	esac
 	;;
       esac
       ;;
 
     newsos6)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       ;;
 
     *nto* | *qnx*)
       # QNX uses GNU C++, but need to define -shared option too, otherwise
       # it will coredump.
       lt_prog_compiler_pic='-fPIC -shared'
       ;;
 
     osf3* | osf4* | osf5*)
       lt_prog_compiler_wl='-Wl,'
       # All OSF/1 code is PIC.
       lt_prog_compiler_static='-non_shared'
       ;;
 
     rdos*)
       lt_prog_compiler_static='-non_shared'
       ;;
 
     solaris*)
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
       f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
       esac
       ;;
 
     sunos4*)
       lt_prog_compiler_wl='-Qoption ld '
       lt_prog_compiler_pic='-PIC'
       lt_prog_compiler_static='-Bstatic'
       ;;
 
     sysv4 | sysv4.2uw2* | sysv4.3*)
       lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec; then
 	lt_prog_compiler_pic='-Kconform_pic'
 	lt_prog_compiler_static='-Bstatic'
       fi
       ;;
 
     sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
       lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       ;;
 
     unicos*)
       lt_prog_compiler_wl='-Wl,'
       lt_prog_compiler_can_build_shared=no
       ;;
 
     uts4*)
       lt_prog_compiler_pic='-pic'
       lt_prog_compiler_static='-Bstatic'
       ;;
 
     *)
       lt_prog_compiler_can_build_shared=no
       ;;
     esac
   fi
 
 case $host_os in
   # For platforms that do not support PIC, -DPIC is meaningless:
   *djgpp*)
     lt_prog_compiler_pic=
     ;;
   *)
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 if ${lt_cv_prog_compiler_pic+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
 $as_echo "$lt_cv_prog_compiler_pic" >&6; }
 lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
 if ${lt_cv_prog_compiler_pic_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
    ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"  ## exclude from sc_useless_quotes_in_assignment
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    # The option is referenced via a variable to avoid confusing sed.
    lt_compile=`echo "$ac_compile" | $SED \
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
      $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
      fi
    fi
    $RM conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_pic_works"; then
     case $lt_prog_compiler_pic in
      "" | " "*) ;;
      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
      esac
 else
     lt_prog_compiler_pic=
      lt_prog_compiler_can_build_shared=no
 fi
 
 fi
 
 
 
 
 
 
 
 
 
 
 
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
 if ${lt_cv_prog_compiler_static_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
    save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
        $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
        fi
      else
        lt_cv_prog_compiler_static_works=yes
      fi
    fi
    $RM -r conftest*
    LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test yes = "$lt_cv_prog_compiler_static_works"; then
     :
 else
     lt_prog_compiler_static=
 fi
 
 
 
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
      $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
    chmod u+w . 2>&5
    $RM conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
    test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
    $RM out/* && rmdir out
    cd ..
    $RM -r conftest
    $RM conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
 if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
    $RM -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
    mkdir out
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
    lt_compiler_flag="-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
    # Note that $ac_compile itself does not contain backslashes and begins
    # with a dollar sign (not a hyphen), so the echo should work correctly.
    lt_compile=`echo "$ac_compile" | $SED \
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
    (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
      $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
      fi
    fi
    chmod u+w . 2>&5
    $RM conftest*
    # SGI C++ compiler will create directory out/ii_files/ for
    # template instantiation
    test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
    $RM out/* && rmdir out
    cd ..
    $RM -r conftest
    $RM conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 
 
 hard_links=nottested
 if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then
   # do not overwrite the value of need_locks provided by the user
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
   if test no = "$hard_links"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
 $as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
 
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
   always_export_symbols=no
   archive_cmds=
   archive_expsym_cmds=
   compiler_needs_object=no
   enable_shared_with_static_runtimes=no
   export_dynamic_flag_spec=
   export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   hardcode_automatic=no
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
   inherit_rpath=no
   link_all_deplibs=unknown
   module_cmds=
   module_expsym_cmds=
   old_archive_from_new_cmds=
   old_archive_from_expsyms_cmds=
   thread_safe_flag_spec=
   whole_archive_flag_spec=
   # include_expsyms should be a list of space-separated symbols to be *always*
   # included in the symbol list
   include_expsyms=
   # exclude_expsyms can be an extended regexp of symbols to exclude
   # it will be wrapped by ' (' and ')$', so one must not match beginning or
   # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
   # as well as any symbol that contains 'd'.
   exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
   # platforms (ab)use it in PIC code, but their linkers get confused if
   # the symbol is explicitly referenced.  Since portable code cannot
   # rely on this symbol name, it's probably fine to never include it in
   # preloaded symbol tables.
   # Exclude shared library initialization/finalization symbols.
   extract_expsyms_cmds=
 
   case $host_os in
   cygwin* | mingw* | pw32* | cegcc*)
     # FIXME: the MSVC++ port hasn't been tested in a loooong time
     # When not using gcc, we currently assume that we are using
     # Microsoft Visual C++.
     if test yes != "$GCC"; then
       with_gnu_ld=no
     fi
     ;;
   interix*)
     # we just hope/assume this is gcc and not c89 (= MSVC++)
     with_gnu_ld=yes
     ;;
   openbsd* | bitrig*)
     with_gnu_ld=no
     ;;
   esac
 
   ld_shlibs=yes
 
   # On some targets, GNU ld is compatible enough with the native linker
   # that we're better off using the native interface for both.
   lt_use_gnu_ld_interface=no
   if test yes = "$with_gnu_ld"; then
     case $host_os in
       aix*)
 	# The AIX port of GNU ld has always aspired to compatibility
 	# with the native linker.  However, as the warning in the GNU ld
 	# block says, versions before 2.19.5* couldn't really create working
 	# shared libraries, regardless of the interface used.
 	case `$LD -v 2>&1` in
 	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
 	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
 	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
 	  *)
 	    lt_use_gnu_ld_interface=yes
 	    ;;
 	esac
 	;;
       *)
 	lt_use_gnu_ld_interface=yes
 	;;
     esac
   fi
 
   if test yes = "$lt_use_gnu_ld_interface"; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='$wl'
 
     # Set some defaults for GNU ld with shared library support. These
     # are reset later if shared libraries are not supported. Putting them
     # here allows them to be overridden if necessary.
     runpath_var=LD_RUN_PATH
     hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
     export_dynamic_flag_spec='$wl--export-dynamic'
     # ancient GNU ld didn't support --whole-archive et. al.
     if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
       whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
     else
       whole_archive_flag_spec=
     fi
     supports_anon_versioning=no
     case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in
       *GNU\ gold*) supports_anon_versioning=yes ;;
       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
       *\ 2.11.*) ;; # other 2.11 versions
       *) supports_anon_versioning=yes ;;
     esac
 
     # See if GNU ld supports shared libraries.
     case $host_os in
     aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test ia64 != "$host_cpu"; then
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
 *** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
 *** really care for shared libraries, you may want to install binutils
 *** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
 *** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
       ;;
 
     amigaos*)
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
             archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
             archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
             hardcode_libdir_flag_spec='-L$libdir'
             hardcode_minus_L=yes
         ;;
       esac
       ;;
 
     beos*)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	allow_undefined_flag=unsupported
 	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
 	# support --undefined.  This deserves some investigation.  FIXME
 	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
     cygwin* | mingw* | pw32* | cegcc*)
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
       export_dynamic_flag_spec='$wl--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
       export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
       exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 	# If the export-symbols file already is a .def file, use it as
 	# is; otherwise, prepend EXPORTS...
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
           cp $export_symbols $output_objdir/$soname.def;
         else
           echo EXPORTS > $output_objdir/$soname.def;
           cat $export_symbols >> $output_objdir/$soname.def;
         fi~
         $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
     haiku*)
       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
       link_all_deplibs=yes
       ;;
 
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
       archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       ;;
 
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='$wl-rpath,$libdir'
       export_dynamic_flag_spec='$wl-E'
       # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
       # Instead, shared libraries are loaded at an image base (0x10000000 by
       # default) and relocated if they conflict, which is a slow very memory
       # consuming and fragmenting process.  To avoid this, we pick a random,
       # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
       # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
       archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
       ;;
 
     gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
       tmp_diet=no
       if test linux-dietlibc = "$host_os"; then
 	case $cc_basename in
 	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
 	esac
       fi
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test no = "$tmp_diet"
       then
 	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
 	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
 	pgf77* | pgf90* | pgf95* | pgfortran*)
 					# Portland Group f77 and f90 compilers
 	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
 	  tmp_addflag=' -i_dynamic -nofor_main' ;;
 	ifc* | ifort*)			# Intel Fortran compiler
 	  tmp_addflag=' -nofor_main' ;;
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
         nagfor*)                        # NAGFOR 5.3
           tmp_sharedflag='-Wl,-shared' ;;
 	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
 	nvcc*)	# Cuda Compiler Driver 2.2
 	  whole_archive_flag_spec='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
 	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
 	  whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
 	  tmp_sharedflag='-G' ;;
 	esac
 	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 
         if test yes = "$supports_anon_versioning"; then
           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
             cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
             echo "local: *; };" >> $output_objdir/$libname.ver~
             $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
         fi
 
 	case $cc_basename in
 	tcc*)
 	  export_dynamic_flag_spec='-rdynamic'
 	  ;;
 	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
 	  hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test yes = "$supports_anon_versioning"; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
               cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
               echo "local: *; };" >> $output_objdir/$libname.ver~
               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
       else
         ld_shlibs=no
       fi
       ;;
 
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
 *** Warning: The releases 2.8.* of the GNU linker cannot reliably
 *** create shared libraries on Solaris systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.9.1 or newer.  Another option is to modify
 *** your PATH or compiler configuration so that the native linker is
 *** used, and then restart.
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
       case `$LD -v 2>&1` in
         *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
 *** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
 *** reliably create shared libraries on SCO systems.  Therefore, libtool
 *** is disabling shared libraries support.  We urge you to upgrade GNU
 *** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
 *** your PATH or compiler configuration so that the native linker is
 *** used, and then restart.
 
 _LT_EOF
 	;;
 	*)
 	  # For security reasons, it is highly recommended that you always
 	  # use absolute paths for naming shared libraries, and exclude the
 	  # DT_RUNPATH tag from executables and libraries.  But doing so
 	  # requires that you compile everything twice, which is a pain.
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
 	  else
 	    ld_shlibs=no
 	  fi
 	;;
       esac
       ;;
 
     sunos4*)
       archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       wlarc=
       hardcode_direct=yes
       hardcode_shlibpath_var=no
       ;;
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
 	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
       ;;
     esac
 
     if test no = "$ld_shlibs"; then
       runpath_var=
       hardcode_libdir_flag_spec=
       export_dynamic_flag_spec=
       whole_archive_flag_spec=
     fi
   else
     # PORTME fill in a description of your system's linker (not GNU ld)
     case $host_os in
     aix3*)
       allow_undefined_flag=unsupported
       always_export_symbols=yes
       archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
       # Note: this linker hardcodes the directories in LIBPATH if there
       # are no directories specified by -L.
       hardcode_minus_L=yes
       if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
 	# Neither direct hardcoding nor static linking is supported with a
 	# broken collect2.
 	hardcode_direct=unsupported
       fi
       ;;
 
     aix[4-9]*)
       if test ia64 = "$host_cpu"; then
 	# On IA64, the linker does run time linking by default, so we don't
 	# have to do anything special.
 	aix_use_runtimelinking=no
 	exp_sym_flag='-Bexport'
 	no_entry_flag=
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
 	# Without the "-l" option, or with the "-B" option, AIX nm treats
 	# weak defined symbols like other global defined symbols, whereas
 	# GNU nm marks them as "W".
 	# While the 'weak' keyword is ignored in the Export File, we need
 	# it in the Import File for the 'aix-soname' feature, so we have
 	# to replace the "-B" option with "-P" for AIX nm.
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
 	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
 	else
 	  export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
 	fi
 	aix_use_runtimelinking=no
 
 	# Test if we are trying to use run time linking or normal
 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 	# have runtime linking enabled, and use it for executables.
 	# For shared libraries, we enable/disable runtime linking
 	# depending on the kind of the shared library created -
 	# when "with_aix_soname,aix_use_runtimelinking" is:
 	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
 	# "aix,yes"  lib.so          shared, rtl:yes, for executables
 	#            lib.a           static archive
 	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
 	#            lib.a(lib.so.V) shared, rtl:no,  for executables
 	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
 	#            lib.a(lib.so.V) shared, rtl:no
 	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
 	#            lib.a           static archive
 	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
 	  for ld_flag in $LDFLAGS; do
 	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
 	    aix_use_runtimelinking=yes
 	    break
 	  fi
 	  done
 	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
 	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
 	    # so we don't have lib.a shared libs to link our executables.
 	    # We have to force runtime linking in this case.
 	    aix_use_runtimelinking=yes
 	    LDFLAGS="$LDFLAGS -Wl,-brtl"
 	  fi
 	  ;;
 	esac
 
 	exp_sym_flag='-bexport'
 	no_entry_flag='-bnoentry'
       fi
 
       # When large executables or shared objects are built, AIX ld can
       # have problems creating the table of contents.  If linking a library
       # or program results in "error TOC overflow" add -mminimal-toc to
       # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
       # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 
       archive_cmds=''
       hardcode_direct=yes
       hardcode_direct_absolute=yes
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
       file_list_spec='$wl-f,'
       case $with_aix_soname,$aix_use_runtimelinking in
       aix,*) ;; # traditional, no import file
       svr4,* | *,yes) # use import file
 	# The Import File defines what to hardcode.
 	hardcode_direct=no
 	hardcode_direct_absolute=no
 	;;
       esac
 
       if test yes = "$GCC"; then
 	case $host_os in aix4.[012]|aix4.[012].*)
 	# We only want to do this on AIX 4.2 and lower, the check
 	# below for broken collect2 doesn't work under 4.3+
 	  collect2name=`$CC -print-prog-name=collect2`
 	  if test -f "$collect2name" &&
 	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
 	  then
 	  # We have reworked collect2
 	  :
 	  else
 	  # We have old collect2
 	  hardcode_direct=unsupported
 	  # It fails to find uninstalled libraries when the uninstalled
 	  # path is not listed in the libpath.  Setting hardcode_minus_L
 	  # to unsupported forces relinking
 	  hardcode_minus_L=yes
 	  hardcode_libdir_flag_spec='-L$libdir'
 	  hardcode_libdir_separator=
 	  fi
 	  ;;
 	esac
 	shared_flag='-shared'
 	if test yes = "$aix_use_runtimelinking"; then
 	  shared_flag="$shared_flag "'$wl-G'
 	fi
 	# Need to ensure runtime linking is disabled for the traditional
 	# shared library, or the linker may eventually find shared libraries
 	# /with/ Import File - we do not want to mix them.
 	shared_flag_aix='-shared'
 	shared_flag_svr4='-shared $wl-G'
       else
 	# not using gcc
 	if test ia64 = "$host_cpu"; then
 	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 	# chokes on -Wl,-G. The following line is correct:
 	  shared_flag='-G'
 	else
 	  if test yes = "$aix_use_runtimelinking"; then
 	    shared_flag='$wl-G'
 	  else
 	    shared_flag='$wl-bM:SRE'
 	  fi
 	  shared_flag_aix='$wl-bM:SRE'
 	  shared_flag_svr4='$wl-G'
 	fi
       fi
 
       export_dynamic_flag_spec='$wl-bexpall'
       # It seems that -bexpall does not export symbols beginning with
       # underscore (_), so it is better to generate a list of symbols to export.
       always_export_symbols=yes
       if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
 	# Warning - without using the other runtime loading flags (-brtl),
 	# -berok will link without error, but may produce a broken library.
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
         if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
 	  /^0/ {
 	      s/^0  *\([^ ]*\) *$/\1/
 	      p
 	  }
       }'
   lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   # Check for a 64-bit object if we didn't find anything.
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
 
   aix_libpath=$lt_cv_aix_libpath_
 fi
 
         hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
         archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
       else
 	if test ia64 = "$host_cpu"; then
 	  hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib'
 	  allow_undefined_flag="-z nodefs"
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
 	 if test set = "${lt_cv_aix_libpath+set}"; then
   aix_libpath=$lt_cv_aix_libpath
 else
   if ${lt_cv_aix_libpath_+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
   lt_aix_libpath_sed='
       /Import File Strings/,/^$/ {
 	  /^0/ {
 	      s/^0  *\([^ ]*\) *$/\1/
 	      p
 	  }
       }'
   lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   # Check for a 64-bit object if we didn't find anything.
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
   fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test -z "$lt_cv_aix_libpath_"; then
     lt_cv_aix_libpath_=/usr/lib:/lib
   fi
 
 fi
 
   aix_libpath=$lt_cv_aix_libpath_
 fi
 
 	 hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' $wl-bernotok'
 	  allow_undefined_flag=' $wl-berok'
 	  if test yes = "$with_gnu_ld"; then
 	    # We only use this code for GNU lds that support --whole-archive.
 	    whole_archive_flag_spec='$wl--whole-archive$convenience $wl--no-whole-archive'
 	  else
 	    # Exported symbols can be pulled into shared objects from archives
 	    whole_archive_flag_spec='$convenience'
 	  fi
 	  archive_cmds_need_lc=yes
 	  archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
 	  # -brtl affects multiple linker settings, -berok does not and is overridden later
 	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`'
 	  if test svr4 != "$with_aix_soname"; then
 	    # This is similar to how AIX traditionally builds its shared libraries.
 	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
 	  fi
 	  if test aix != "$with_aix_soname"; then
 	    archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
 	  else
 	    # used by -dlpreopen to get the symbols
 	    archive_expsym_cmds="$archive_expsym_cmds"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
 	  fi
 	  archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d'
 	fi
       fi
       ;;
 
     amigaos*)
       case $host_cpu in
       powerpc)
             # see comment about AmigaOS4 .so support
             archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
             archive_expsym_cmds=''
         ;;
       m68k)
             archive_cmds='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
             hardcode_libdir_flag_spec='-L$libdir'
             hardcode_minus_L=yes
         ;;
       esac
       ;;
 
     bsdi[45]*)
       export_dynamic_flag_spec=-rdynamic
       ;;
 
     cygwin* | mingw* | pw32* | cegcc*)
       # When not using gcc, we currently assume that we are using
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
       case $cc_basename in
       cl*)
 	# Native MSVC
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	always_export_symbols=yes
 	file_list_spec='@'
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
 	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
 	archive_expsym_cmds='if   test DEF = "`$SED -n     -e '\''s/^[	 ]*//'\''     -e '\''/^\(;.*\)*$/d'\''     -e '\''s/^\(EXPORTS\|LIBRARY\)\([	 ].*\)*$/DEF/p'\''     -e q     $export_symbols`" ; then
             cp "$export_symbols" "$output_objdir/$soname.def";
             echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
           else
             $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
           fi~
           $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
           linknames='
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
 	enable_shared_with_static_runtimes=yes
 	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
 	postlink_cmds='lt_outputfile="@OUTPUT@"~
           lt_tool_outputfile="@TOOL_OUTPUT@"~
           case $lt_outputfile in
             *.exe|*.EXE) ;;
             *)
               lt_outputfile=$lt_outputfile.exe
               lt_tool_outputfile=$lt_tool_outputfile.exe
               ;;
           esac~
           if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
             $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
             $RM "$lt_outputfile.manifest";
           fi'
 	;;
       *)
 	# Assume MSVC wrapper
 	hardcode_libdir_flag_spec=' '
 	allow_undefined_flag=unsupported
 	# Tell ltmain to make .lib files, not .a files.
 	libext=lib
 	# Tell ltmain to make .dll files, not .so files.
 	shrext_cmds=.dll
 	# FIXME: Setting linknames here is a bad hack.
 	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
 	# The linker will automatically build a .lib file if we build a DLL.
 	old_archive_from_new_cmds='true'
 	# FIXME: Should let the user specify the lib program.
 	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
 	enable_shared_with_static_runtimes=yes
 	;;
       esac
       ;;
 
     darwin* | rhapsody*)
 
 
   archive_cmds_need_lc=no
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
   if test yes = "$lt_cv_ld_force_load"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
 
   else
     whole_archive_flag_spec=''
   fi
   link_all_deplibs=yes
   allow_undefined_flag=$_lt_dar_allow_undefined
   case $cc_basename in
      ifort*|nagfor*) _lt_dar_can_shared=yes ;;
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test yes = "$_lt_dar_can_shared"; then
     output_verbose_link_cmd=func_echo_all
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
     archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
     module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
 
   else
   ld_shlibs=no
   fi
 
       ;;
 
     dgux*)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_shlibpath_var=no
       ;;
 
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
     # extra space).
     freebsd2.2*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
     freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
       hardcode_shlibpath_var=no
       ;;
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
       ;;
 
     hpux9*)
       if test yes = "$GCC"; then
 	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       else
 	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
       fi
       hardcode_libdir_flag_spec='$wl+b $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_direct=yes
 
       # hardcode_minus_L: Not really in the search PATH,
       # but as the default location of the library.
       hardcode_minus_L=yes
       export_dynamic_flag_spec='$wl-E'
       ;;
 
     hpux10*)
       if test yes,no = "$GCC,$with_gnu_ld"; then
 	archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test no = "$with_gnu_ld"; then
 	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
 	export_dynamic_flag_spec='$wl-E'
 	# hardcode_minus_L: Not really in the search PATH,
 	# but as the default location of the library.
 	hardcode_minus_L=yes
       fi
       ;;
 
     hpux11*)
       if test yes,no = "$GCC,$with_gnu_ld"; then
 	case $host_cpu in
 	hppa*64*)
 	  archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
 	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 	  archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
 	case $host_cpu in
 	hppa*64*)
 	  archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
 	  archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
 
 	  # Older versions of the 11.00 compiler do not understand -b yet
 	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
 	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
 $as_echo_n "checking if $CC understands -b... " >&6; }
 if ${lt_cv_prog_compiler__b+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler__b=no
    save_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS -b"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
    if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
      # The linker can only warn and ignore the option if not recognized
      # So say no if there are warnings
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
        $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler__b=yes
        fi
      else
        lt_cv_prog_compiler__b=yes
      fi
    fi
    $RM -r conftest*
    LDFLAGS=$save_LDFLAGS
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
 $as_echo "$lt_cv_prog_compiler__b" >&6; }
 
 if test yes = "$lt_cv_prog_compiler__b"; then
     archive_cmds='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 else
     archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
 fi
 
 	  ;;
 	esac
       fi
       if test no = "$with_gnu_ld"; then
 	hardcode_libdir_flag_spec='$wl+b $wl$libdir'
 	hardcode_libdir_separator=:
 
 	case $host_cpu in
 	hppa*64*|ia64*)
 	  hardcode_direct=no
 	  hardcode_shlibpath_var=no
 	  ;;
 	*)
 	  hardcode_direct=yes
 	  hardcode_direct_absolute=yes
 	  export_dynamic_flag_spec='$wl-E'
 
 	  # hardcode_minus_L: Not really in the search PATH,
 	  # but as the default location of the library.
 	  hardcode_minus_L=yes
 	  ;;
 	esac
       fi
       ;;
 
     irix5* | irix6* | nonstopux*)
       if test yes = "$GCC"; then
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
 	# This should be the same for all languages, so no per-tag cache variable.
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
 $as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
 if ${lt_cv_irix_exported_symbol+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   save_LDFLAGS=$LDFLAGS
 	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
 	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int foo (void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_irix_exported_symbol=yes
 else
   lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
            LDFLAGS=$save_LDFLAGS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
 $as_echo "$lt_cv_irix_exported_symbol" >&6; }
 	if test yes = "$lt_cv_irix_exported_symbol"; then
           archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
 	fi
       else
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       inherit_rpath=yes
       link_all_deplibs=yes
       ;;
 
     linux*)
       case $cc_basename in
       tcc*)
 	# Fabrice Bellard et al's Tiny C Compiler
 	ld_shlibs=yes
 	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	;;
       esac
       ;;
 
     netbsd*)
       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
       else
 	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
       fi
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
       ;;
 
     newsos6)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       hardcode_shlibpath_var=no
       ;;
 
     *nto* | *qnx*)
       ;;
 
     openbsd* | bitrig*)
       if test -f /usr/libexec/ld.so; then
 	hardcode_direct=yes
 	hardcode_shlibpath_var=no
 	hardcode_direct_absolute=yes
 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	  export_dynamic_flag_spec='$wl-E'
 	else
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	fi
       else
 	ld_shlibs=no
       fi
       ;;
 
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
       shrext_cmds=.dll
       archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
 	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
 	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
 	$ECHO EXPORTS >> $output_objdir/$libname.def~
 	prefix_cmds="$SED"~
 	if test EXPORTS = "`$SED 1q $export_symbols`"; then
 	  prefix_cmds="$prefix_cmds -e 1d";
 	fi~
 	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
 	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
 	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
 	emximp -o $lib $output_objdir/$libname.def'
       old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
       enable_shared_with_static_runtimes=yes
       ;;
 
     osf3*)
       if test yes = "$GCC"; then
 	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       hardcode_libdir_separator=:
       ;;
 
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test yes = "$GCC"; then
 	allow_undefined_flag=' $wl-expect_unresolved $wl\*'
 	archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
 	hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
 	archive_cmds='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
           $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_separator=:
       ;;
 
     solaris*)
       no_undefined_flag=' -z defs'
       if test yes = "$GCC"; then
 	wlarc='$wl'
 	archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
           $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
 	  wlarc=''
 	  archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
             $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
 	  ;;
 	*)
 	  wlarc='$wl'
 	  archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
 	  archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
             $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
 	  ;;
 	esac
       fi
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_shlibpath_var=no
       case $host_os in
       solaris2.[0-5] | solaris2.[0-5].*) ;;
       *)
 	# The compiler driver will combine and reorder linker options,
 	# but understands '-z linker_flag'.  GCC discards it without '$wl',
 	# but is careful enough not to reorder.
 	# Supported since Solaris 2.6 (maybe 2.5.1?)
 	if test yes = "$GCC"; then
 	  whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
 	else
 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
 	fi
 	;;
       esac
       link_all_deplibs=yes
       ;;
 
     sunos4*)
       if test sequent = "$host_vendor"; then
 	# Use $CC to link under sequent, because it throws in some extra .o
 	# files that make .init and .fini sections work.
 	archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
       fi
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_direct=yes
       hardcode_minus_L=yes
       hardcode_shlibpath_var=no
       ;;
 
     sysv4)
       case $host_vendor in
 	sni)
 	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  hardcode_direct=yes # is this really true???
 	;;
 	siemens)
 	  ## LD is ld it makes a PLAMLIB
 	  ## CC just makes a GrossModule.
 	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
 	  reload_cmds='$CC -r -o $output$reload_objs'
 	  hardcode_direct=no
         ;;
 	motorola)
 	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
 	;;
       esac
       runpath_var='LD_RUN_PATH'
       hardcode_shlibpath_var=no
       ;;
 
     sysv4.3*)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_shlibpath_var=no
       export_dynamic_flag_spec='-Bexport'
       ;;
 
     sysv4*MP*)
       if test -d /usr/nec; then
 	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 	hardcode_shlibpath_var=no
 	runpath_var=LD_RUN_PATH
 	hardcode_runpath_var=yes
 	ld_shlibs=yes
       fi
       ;;
 
     sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
       no_undefined_flag='$wl-z,text'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
       runpath_var='LD_RUN_PATH'
 
       if test yes = "$GCC"; then
 	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     sysv5* | sco3.2v5* | sco5v6*)
       # Note: We CANNOT use -z defs as we might desire, because we do not
       # link with -lc, and that would cause any symbols used from libc to
       # always be unresolved, which means just about no library would
       # ever link correctly.  If we're not using GNU ld we use -z text
       # though, which does catch some bad symbols but isn't as heavy-handed
       # as -z defs.
       no_undefined_flag='$wl-z,text'
       allow_undefined_flag='$wl-z,nodefs'
       archive_cmds_need_lc=no
       hardcode_shlibpath_var=no
       hardcode_libdir_flag_spec='$wl-R,$libdir'
       hardcode_libdir_separator=':'
       link_all_deplibs=yes
       export_dynamic_flag_spec='$wl-Bexport'
       runpath_var='LD_RUN_PATH'
 
       if test yes = "$GCC"; then
 	archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
       fi
       ;;
 
     uts4*)
       archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_shlibpath_var=no
       ;;
 
     *)
       ld_shlibs=no
       ;;
     esac
 
     if test sni = "$host_vendor"; then
       case $host in
       sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 	export_dynamic_flag_spec='$wl-Blargedynsym'
 	;;
       esac
     fi
   fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
 test no = "$ld_shlibs" && can_build_shared=no
 
 with_gnu_ld=$with_gnu_ld
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 #
 # Do we need to explicitly link libc?
 #
 case "x$archive_cmds_need_lc" in
 x|xyes)
   # Assume -lc should be added
   archive_cmds_need_lc=yes
 
   if test yes,yes = "$GCC,$enable_shared"; then
     case $archive_cmds in
     *'~'*)
       # FIXME: we may have to deal with multi-command sequences.
       ;;
     '$CC '*)
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
 if ${lt_cv_archive_cmds_need_lc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   $RM conftest*
 	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
 	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
 	  soname=conftest
 	  lib=conftest
 	  libobjs=conftest.$ac_objext
 	  deplibs=
 	  wl=$lt_prog_compiler_wl
 	  pic_flag=$lt_prog_compiler_pic
 	  compiler_flags=-v
 	  linker_flags=-v
 	  verstring=
 	  output_objdir=.
 	  libname=conftest
 	  lt_save_allow_undefined_flag=$allow_undefined_flag
 	  allow_undefined_flag=
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 	  then
 	    lt_cv_archive_cmds_need_lc=no
 	  else
 	    lt_cv_archive_cmds_need_lc=yes
 	  fi
 	  allow_undefined_flag=$lt_save_allow_undefined_flag
 	else
 	  cat conftest.err 1>&5
 	fi
 	$RM conftest*
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
 $as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
       archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
   fi
   ;;
 esac
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test yes = "$GCC"; then
   case $host_os in
     darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
     *) lt_awk_arg='/^libraries:/' ;;
   esac
   case $host_os in
     mingw* | cegcc*) lt_sed_strip_eq='s|=\([A-Za-z]:\)|\1|g' ;;
     *) lt_sed_strip_eq='s|=/|/|g' ;;
   esac
   lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
   case $lt_search_path_spec in
   *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
     lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
     ;;
   *)
     lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
     ;;
   esac
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary...
   lt_tmp_lt_search_path_spec=
   lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
   # ...but if some path component already ends with the multilib dir we assume
   # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
   case "$lt_multi_os_dir; $lt_search_path_spec " in
   "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
     lt_multi_os_dir=
     ;;
   esac
   for lt_sys_path in $lt_search_path_spec; do
     if test -d "$lt_sys_path$lt_multi_os_dir"; then
       lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
     elif test -n "$lt_multi_os_dir"; then
       test -d "$lt_sys_path" && \
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
   lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 BEGIN {RS = " "; FS = "/|\n";} {
   lt_foo = "";
   lt_count = 0;
   for (lt_i = NF; lt_i > 0; lt_i--) {
     if ($lt_i != "" && $lt_i != ".") {
       if ($lt_i == "..") {
         lt_count++;
       } else {
         if (lt_count == 0) {
           lt_foo = "/" $lt_i lt_foo;
         } else {
           lt_count--;
         }
       }
     }
   }
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
   # AWK program above erroneously prepends '/' to C:/dos/paths
   # for these hosts.
   case $host_os in
     mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
       $SED 's|/\([A-Za-z]:\)|\1|g'` ;;
   esac
   sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
 shrext_cmds=.so
 postinstall_cmds=
 postuninstall_cmds=
 finish_cmds=
 finish_eval=
 shlibpath_var=
 shlibpath_overrides_runpath=unknown
 version_type=none
 dynamic_linker="$host_os ld.so"
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
 need_lib_prefix=unknown
 hardcode_into_libs=no
 
 # when you set need_version to no, make sure it does not cause -set_version
 # flags to be left without arguments
 need_version=unknown
 
 
 
 case $host_os in
 aix3*)
   version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
   # AIX 3 has no versioning support, so we append a major version to the name.
   soname_spec='$libname$release$shared_ext$major'
   ;;
 
 aix[4-9]*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
   if test ia64 = "$host_cpu"; then
     # AIX 5 supports IA64
     library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
     shlibpath_var=LD_LIBRARY_PATH
   else
     # With GCC up to 2.95.x, collect2 would create an import file
     # for dependence libraries.  The import file would start with
     # the line '#! .'.  This would cause the generated library to
     # depend on '.', always an invalid library.  This was fixed in
     # development snapshots of GCC prior to 3.0.
     case $host_os in
       aix4 | aix4.[01] | aix4.[01].*)
       if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 	   echo ' yes '
 	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
 	:
       else
 	can_build_shared=no
       fi
       ;;
     esac
     # Using Import Files as archive members, it is possible to support
     # filename-based versioning of shared library archives on AIX. While
     # this would work for both with and without runtime linking, it will
     # prevent static linking of such archives. So we do filename-based
     # shared library versioning with .so extension only, which is used
     # when both runtime linking and shared linking is enabled.
     # Unfortunately, runtime linking may impact performance, so we do
     # not want this to be the default eventually. Also, we use the
     # versioned .so libs for executables only if there is the -brtl
     # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
     # To allow for filename-based versioning support, we need to create
     # libNAME.so.V as an archive file, containing:
     # *) an Import File, referring to the versioned filename of the
     #    archive as well as the shared archive member, telling the
     #    bitwidth (32 or 64) of that shared object, and providing the
     #    list of exported symbols of that shared object, eventually
     #    decorated with the 'weak' keyword
     # *) the shared object with the F_LOADONLY flag set, to really avoid
     #    it being seen by the linker.
     # At run time we better use the real file rather than another symlink,
     # but for link time we create the symlink libNAME.so -> libNAME.so.V
 
     case $with_aix_soname,$aix_use_runtimelinking in
     # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
     # soname into executable. Probably we can add versioning support to
     # collect2, so additional links can be useful in future.
     aix,yes) # traditional libtool
       dynamic_linker='AIX unversionable lib.so'
       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
       # instead of lib<name>.a to let people know that these are not
       # typical AIX shared libraries.
       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
       ;;
     aix,no) # traditional AIX only
       dynamic_linker='AIX lib.a(lib.so.V)'
       # We preserve .a as extension for shared libraries through AIX4.2
       # and later when we are not doing run time linking.
       library_names_spec='$libname$release.a $libname.a'
       soname_spec='$libname$release$shared_ext$major'
       ;;
     svr4,*) # full svr4 only
       dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)"
       library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
       # We do not specify a path in Import Files, so LIBPATH fires.
       shlibpath_overrides_runpath=yes
       ;;
     *,yes) # both, prefer svr4
       dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)"
       library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
       # unpreferred sharedlib libNAME.a needs extra handling
       postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
       postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
       # We do not specify a path in Import Files, so LIBPATH fires.
       shlibpath_overrides_runpath=yes
       ;;
     *,no) # both, prefer aix
       dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)"
       library_names_spec='$libname$release.a $libname.a'
       soname_spec='$libname$release$shared_ext$major'
       # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
       postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
       postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
       ;;
     esac
     shlibpath_var=LIBPATH
   fi
   ;;
 
 amigaos*)
   case $host_cpu in
   powerpc)
     # Since July 2007 AmigaOS4 officially supports .so libraries.
     # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
     library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     ;;
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
     finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
 
 beos*)
   library_names_spec='$libname$shared_ext'
   dynamic_linker="$host_os ld.so"
   shlibpath_var=LIBRARY_PATH
   ;;
 
 bsdi[45]*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
   # the default ld.so.conf also contains /usr/contrib/lib and
   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
   # libtool to hard-code these into programs
   ;;
 
 cygwin* | mingw* | pw32* | cegcc*)
   version_type=windows
   shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
 
   case $GCC,$cc_basename in
   yes,*)
     # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \$file`~
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname~
       chmod a+x \$dldir/$dlname~
       if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
         eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
       fi'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $RM \$dlpath'
     shlibpath_overrides_runpath=yes
 
     case $host_os in
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
 
       sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
       ;;
     esac
     dynamic_linker='Win32 ld.exe'
     ;;
 
   *,cl*)
     # Native MSVC
     libname_spec='$name'
     soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext'
     library_names_spec='$libname.dll.lib'
 
     case $build_os in
     mingw*)
       sys_lib_search_path_spec=
       lt_save_ifs=$IFS
       IFS=';'
       for lt_path in $LIB
       do
         IFS=$lt_save_ifs
         # Let DOS variable expansion print the short 8.3 style file name.
         lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
         sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
       done
       IFS=$lt_save_ifs
       # Convert to MSYS style.
       sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
       ;;
     cygwin*)
       # Convert to unix form, then to dos form, then back to unix form
       # but this time dos style (no spaces!) so that the unix form looks
       # like /cygdrive/c/PROGRA~1:/cygdr...
       sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
       sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
       sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       ;;
     *)
       sys_lib_search_path_spec=$LIB
       if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
         # It is most probably a Windows format PATH.
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
       else
         sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
       fi
       # FIXME: find the short name or the path components, as spaces are
       # common. (e.g. "Program Files" -> "PROGRA~1")
       ;;
     esac
 
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \$file`~
       dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
       dldir=$destdir/`dirname \$dlpath`~
       test -d \$dldir || mkdir -p \$dldir~
       $install_prog $dir/$dlname \$dldir/$dlname'
     postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
       dlpath=$dir/\$dldll~
        $RM \$dlpath'
     shlibpath_overrides_runpath=yes
     dynamic_linker='Win32 link.exe'
     ;;
 
   *)
     # Assume MSVC wrapper
     library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib'
     dynamic_linker='Win32 ld.exe'
     ;;
   esac
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
 
 darwin* | rhapsody*)
   dynamic_linker="$host_os dyld"
   version_type=darwin
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
   soname_spec='$libname$release$major$shared_ext'
   shlibpath_overrides_runpath=yes
   shlibpath_var=DYLD_LIBRARY_PATH
   shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
 
   sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
   sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
   ;;
 
 dgux*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
   if test -x /usr/bin/objformat; then
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
     freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
       library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
       soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
       ;;
     freebsd-*)
       library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
       need_version=yes
       ;;
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
   freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
   freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
   freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
     shlibpath_overrides_runpath=no
     hardcode_into_libs=yes
     ;;
   *) # from 4.6 on, and DragonFly
     shlibpath_overrides_runpath=yes
     hardcode_into_libs=yes
     ;;
   esac
   ;;
 
 haiku*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   dynamic_linker="$host_os runtime_loader"
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LIBRARY_PATH
   shlibpath_overrides_runpath=no
   sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
 hpux9* | hpux10* | hpux11*)
   # Give a soname corresponding to the major version so that dld.sl refuses to
   # link against other versions.
   version_type=sunos
   need_lib_prefix=no
   need_version=no
   case $host_cpu in
   ia64*)
     shrext_cmds='.so'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.so"
     shlibpath_var=LD_LIBRARY_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
     library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     soname_spec='$libname$release$shared_ext$major'
     if test 32 = "$HPUX_IA64_MODE"; then
       sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
       sys_lib_dlsearch_path_spec=/usr/lib/hpux32
     else
       sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
       sys_lib_dlsearch_path_spec=/usr/lib/hpux64
     fi
     ;;
   hppa*64*)
     shrext_cmds='.sl'
     hardcode_into_libs=yes
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
     library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     soname_spec='$libname$release$shared_ext$major'
     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     ;;
   *)
     shrext_cmds='.sl'
     dynamic_linker="$host_os dld.sl"
     shlibpath_var=SHLIB_PATH
     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
     library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     soname_spec='$libname$release$shared_ext$major'
     ;;
   esac
   # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
   # or fails outright, so override atomically:
   install_override_mode=555
   ;;
 
 interix[3-9]*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 irix5* | irix6* | nonstopux*)
   case $host_os in
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test yes = "$lt_cv_prog_gnu_ld"; then
 		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
   esac
   need_lib_prefix=no
   need_version=no
   soname_spec='$libname$release$shared_ext$major'
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
   case $host_os in
   irix5* | nonstopux*)
     libsuff= shlibsuff=
     ;;
   *)
     case $LD in # libtool.m4 will add one of these switches to LD
     *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
       libsuff= shlibsuff= libmagic=32-bit;;
     *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
       libsuff=32 shlibsuff=N32 libmagic=N32;;
     *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
       libsuff=64 shlibsuff=64 libmagic=64-bit;;
     *) libsuff= shlibsuff= libmagic=never-match;;
     esac
     ;;
   esac
   shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
   shlibpath_overrides_runpath=no
   sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
   sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
   hardcode_into_libs=yes
   ;;
 
 # No shared lib support for Linux oldld, aout, or coff.
 linux*oldld* | linux*aout* | linux*coff*)
   dynamic_linker=no
   ;;
 
 linux*android*)
   version_type=none # Android doesn't support versioned libraries.
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext'
   soname_spec='$libname$release$shared_ext'
   finish_cmds=
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
   dynamic_linker='Android linker'
   # Don't embed -rpath directories since the linker doesn't support them.
   hardcode_libdir_flag_spec='-L$libdir'
   ;;
 
 # This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
 
   # Some binutils ld are patched to set DT_RUNPATH
   if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_shlibpath_overrides_runpath=no
     save_LDFLAGS=$LDFLAGS
     save_libdir=$libdir
     eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
 	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
   lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_LDFLAGS
     libdir=$save_libdir
 
 fi
 
   shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
   # before this can be enabled.
   hardcode_into_libs=yes
 
   # Ideally, we could use ldconfig to report *all* directores which are
   # searched for libraries, however this is still not possible.  Aside from not
   # being certain /sbin/ldconfig is available, command
   # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
   # even though it is searched at run-time.  Try to do the best guess by
   # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
   # most powerpc-linux boxes support dynamic linking these days and
   # people can always --disable-shared, the test was removed, and we
   # assume the GNU/Linux dynamic linker is in use.
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
 netbsd*)
   version_type=sunos
   need_lib_prefix=no
   need_version=no
   if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
     library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
     library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
     soname_spec='$libname$release$shared_ext$major'
     dynamic_linker='NetBSD ld.elf_so'
   fi
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
   ;;
 
 newsos6)
   version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
 
 *nto* | *qnx*)
   version_type=qnx
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   dynamic_linker='ldqnx.so'
   ;;
 
 openbsd* | bitrig*)
   version_type=sunos
   sys_lib_dlsearch_path_spec=/usr/lib
   need_lib_prefix=no
   if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
     need_version=no
   else
     need_version=yes
   fi
   library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   ;;
 
 os2*)
   libname_spec='$name'
   version_type=windows
   shrext_cmds=.dll
   need_version=no
   need_lib_prefix=no
   # OS/2 can only load a DLL with a base name of 8 characters or less.
   soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
     v=$($ECHO $release$versuffix | tr -d .-);
     n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
     $ECHO $n$v`$shared_ext'
   library_names_spec='${libname}_dll.$libext'
   dynamic_linker='OS/2 ld.exe'
   shlibpath_var=BEGINLIBPATH
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
   sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   postinstall_cmds='base_file=`basename \$file`~
     dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
     dldir=$destdir/`dirname \$dlpath`~
     test -d \$dldir || mkdir -p \$dldir~
     $install_prog $dir/$dlname \$dldir/$dlname~
     chmod a+x \$dldir/$dlname~
     if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
       eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
     fi'
   postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
     dlpath=$dir/\$dldll~
     $RM \$dlpath'
   ;;
 
 osf3* | osf4* | osf5*)
   version_type=osf
   need_lib_prefix=no
   need_version=no
   soname_spec='$libname$release$shared_ext$major'
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
   sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
   ;;
 
 rdos*)
   dynamic_linker=no
   ;;
 
 solaris*)
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
   # ldd complains unless libraries are executable
   postinstall_cmds='chmod +x $lib'
   ;;
 
 sunos4*)
   version_type=sunos
   library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   if test yes = "$with_gnu_ld"; then
     need_lib_prefix=no
   fi
   need_version=yes
   ;;
 
 sysv4 | sysv4.3*)
   version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   case $host_vendor in
     sni)
       shlibpath_overrides_runpath=no
       need_lib_prefix=no
       runpath_var=LD_RUN_PATH
       ;;
     siemens)
       need_lib_prefix=no
       ;;
     motorola)
       need_lib_prefix=no
       need_version=no
       shlibpath_overrides_runpath=no
       sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
       ;;
   esac
   ;;
 
 sysv4*MP*)
   if test -d /usr/nec; then
     version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
     soname_spec='$libname$shared_ext.$major'
     shlibpath_var=LD_LIBRARY_PATH
   fi
   ;;
 
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
   version_type=sco
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   hardcode_into_libs=yes
   if test yes = "$with_gnu_ld"; then
     sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
   else
     sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
     case $host_os in
       sco3.2v5*)
         sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
 	;;
     esac
   fi
   sys_lib_dlsearch_path_spec='/usr/lib'
   ;;
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
   version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   hardcode_into_libs=yes
   ;;
 
 uts4*)
   version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
   soname_spec='$libname$release$shared_ext$major'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
 *)
   dynamic_linker=no
   ;;
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
 test no = "$dynamic_linker" && can_build_shared=no
 
 variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 if test yes = "$GCC"; then
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
 if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
   sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
 fi
 
 if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
   sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
 fi
 
 # remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
 configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
 
 # ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
 func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
 
 # to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
 configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
    test -n "$runpath_var" ||
    test yes = "$hardcode_automatic"; then
 
   # We can hardcode non-existent directories.
   if test no != "$hardcode_direct" &&
      # If the only mechanism to avoid hardcoding is shlibpath_var, we
      # have to relink, otherwise we might link with an installed library
      # when we should be linking with a yet-to-be-installed one
      ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" &&
      test no != "$hardcode_minus_L"; then
     # Linking always hardcodes the temporary library directory.
     hardcode_action=relink
   else
     # We can link without hardcoding, and we can hardcode nonexisting dirs.
     hardcode_action=immediate
   fi
 else
   # We cannot hardcode anything, or else we can only hardcode existing
   # directories.
   hardcode_action=unsupported
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
 if test relink = "$hardcode_action" ||
    test yes = "$inherit_rpath"; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test yes = "$shlibpath_overrides_runpath" ||
      test no = "$enable_shared"; then
   # Fast installation is not necessary
   enable_fast_install=needless
 fi
 
 
 
 
 
 
   if test yes != "$enable_dlopen"; then
   enable_dlopen=unknown
   enable_dlopen_self=unknown
   enable_dlopen_self_static=unknown
 else
   lt_cv_dlopen=no
   lt_cv_dlopen_libs=
 
   case $host_os in
   beos*)
     lt_cv_dlopen=load_add_on
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
     ;;
 
   mingw* | pw32* | cegcc*)
     lt_cv_dlopen=LoadLibrary
     lt_cv_dlopen_libs=
     ;;
 
   cygwin*)
     lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     ;;
 
   darwin*)
     # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char dlopen ();
 int
 main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
   ac_cv_lib_dl_dlopen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
 
     lt_cv_dlopen=dyld
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
 
 fi
 
     ;;
 
   tpf*)
     # Don't try to run any link tests for TPF.  We know it's impossible
     # because TPF is a cross-compiler, and we know how we open DSOs.
     lt_cv_dlopen=dlopen
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=no
     ;;
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
 if test "x$ac_cv_func_shl_load" = xyes; then :
   lt_cv_dlopen=shl_load
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
 if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char shl_load ();
 int
 main ()
 {
 return shl_load ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
   ac_cv_lib_dld_shl_load=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
 if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
 if test "x$ac_cv_func_dlopen" = xyes; then :
   lt_cv_dlopen=dlopen
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char dlopen ();
 int
 main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
   ac_cv_lib_dl_dlopen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
 if ${ac_cv_lib_svld_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char dlopen ();
 int
 main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_svld_dlopen=yes
 else
   ac_cv_lib_svld_dlopen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
 if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
   lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
 if ${ac_cv_lib_dld_dld_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char dld_link ();
 int
 main ()
 {
 return dld_link ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_dld_link=yes
 else
   ac_cv_lib_dld_dld_link=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
 if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
   lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld
 fi
 
 
 fi
 
 
 fi
 
 
 fi
 
 
 fi
 
 
 fi
 
     ;;
   esac
 
   if test no = "$lt_cv_dlopen"; then
     enable_dlopen=no
   else
     enable_dlopen=yes
   fi
 
   case $lt_cv_dlopen in
   dlopen)
     save_CPPFLAGS=$CPPFLAGS
     test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 
     save_LDFLAGS=$LDFLAGS
     wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 
     save_LIBS=$LIBS
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
 if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
 #line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
 
 #include <stdio.h>
 
 #ifdef RTLD_GLOBAL
 #  define LT_DLGLOBAL		RTLD_GLOBAL
 #else
 #  ifdef DL_GLOBAL
 #    define LT_DLGLOBAL		DL_GLOBAL
 #  else
 #    define LT_DLGLOBAL		0
 #  endif
 #endif
 
 /* We may have to define LT_DLLAZY_OR_NOW in the command line if we
    find out it does not work in some platform. */
 #ifndef LT_DLLAZY_OR_NOW
 #  ifdef RTLD_LAZY
 #    define LT_DLLAZY_OR_NOW		RTLD_LAZY
 #  else
 #    ifdef DL_LAZY
 #      define LT_DLLAZY_OR_NOW		DL_LAZY
 #    else
 #      ifdef RTLD_NOW
 #        define LT_DLLAZY_OR_NOW	RTLD_NOW
 #      else
 #        ifdef DL_NOW
 #          define LT_DLLAZY_OR_NOW	DL_NOW
 #        else
 #          define LT_DLLAZY_OR_NOW	0
 #        endif
 #      endif
 #    endif
 #  endif
 #endif
 
 /* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
 int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
   int status = $lt_dlunknown;
 
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
       else
         {
 	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
           else puts (dlerror ());
 	}
       /* dlclose (self); */
     }
   else
     puts (dlerror ());
 
   return status;
 }
 _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
       x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
     esac
   else :
     # compilation failed
     lt_cv_dlopen_self=no
   fi
 fi
 rm -fr conftest*
 
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test yes = "$lt_cv_dlopen_self"; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
 if ${lt_cv_dlopen_self_static+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test yes = "$cross_compiling"; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
 #line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
 
 #include <stdio.h>
 
 #ifdef RTLD_GLOBAL
 #  define LT_DLGLOBAL		RTLD_GLOBAL
 #else
 #  ifdef DL_GLOBAL
 #    define LT_DLGLOBAL		DL_GLOBAL
 #  else
 #    define LT_DLGLOBAL		0
 #  endif
 #endif
 
 /* We may have to define LT_DLLAZY_OR_NOW in the command line if we
    find out it does not work in some platform. */
 #ifndef LT_DLLAZY_OR_NOW
 #  ifdef RTLD_LAZY
 #    define LT_DLLAZY_OR_NOW		RTLD_LAZY
 #  else
 #    ifdef DL_LAZY
 #      define LT_DLLAZY_OR_NOW		DL_LAZY
 #    else
 #      ifdef RTLD_NOW
 #        define LT_DLLAZY_OR_NOW	RTLD_NOW
 #      else
 #        ifdef DL_NOW
 #          define LT_DLLAZY_OR_NOW	DL_NOW
 #        else
 #          define LT_DLLAZY_OR_NOW	0
 #        endif
 #      endif
 #    endif
 #  endif
 #endif
 
 /* When -fvisibility=hidden is used, assume the code has been annotated
    correspondingly for the symbols needed.  */
 #if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
 int fnord () __attribute__((visibility("default")));
 #endif
 
 int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
   int status = $lt_dlunknown;
 
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
       else
         {
 	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
           else puts (dlerror ());
 	}
       /* dlclose (self); */
     }
   else
     puts (dlerror ());
 
   return status;
 }
 _LT_EOF
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
       x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
     esac
   else :
     # compilation failed
     lt_cv_dlopen_self_static=no
   fi
 fi
 rm -fr conftest*
 
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS=$save_CPPFLAGS
     LDFLAGS=$save_LDFLAGS
     LIBS=$save_LIBS
     ;;
   esac
 
   case $lt_cv_dlopen_self in
   yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
   *) enable_dlopen_self=unknown ;;
   esac
 
   case $lt_cv_dlopen_self_static in
   yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
   *) enable_dlopen_self_static=unknown ;;
   esac
 fi
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 striplib=
 old_striplib=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
   darwin*)
     if test -n "$STRIP"; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     fi
     ;;
   *)
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     ;;
   esac
 fi
 
 
 
 
 
 
 
 
 
 
 
 
   # Report what library types will actually be built
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
 $as_echo "$can_build_shared" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
   test no = "$can_build_shared" && enable_shared=no
 
   # On AIX, shared libraries and static libraries use the same namespace, and
   # are all built from PIC.
   case $host_os in
   aix3*)
     test yes = "$enable_shared" && enable_static=no
     if test -n "$RANLIB"; then
       archive_cmds="$archive_cmds~\$RANLIB \$lib"
       postinstall_cmds='$RANLIB $lib'
     fi
     ;;
 
   aix[4-9]*)
     if test ia64 != "$host_cpu"; then
       case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
       yes,aix,yes) ;;			# shared object as lib.so file only
       yes,svr4,*) ;;			# shared object as lib.so archive member only
       yes,*) enable_static=no ;;	# shared object in lib.a archive as well
       esac
     fi
     ;;
   esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
 $as_echo "$enable_shared" >&6; }
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test yes = "$enable_shared" || enable_static=yes
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
 
 
 
 fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 CC=$lt_save_CC
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
         ac_config_commands="$ac_config_commands libtool"
 
 
 
 
 # Only expand once:
 
 
 
+# pkg-config
+
+
+
+
+
+    if test x"${PKG_CONFIG}" = x"" ; then
+        for ac_prog in pkgconf pkg-config
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PKG_CONFIG" && break
+done
+ >/dev/null
+    else
+        # Extract the first word of "${PKG_CONFIG}", so it can be a program name with args.
+set dummy ${PKG_CONFIG}; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    fi
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pkg-config or pkgconf" >&5
+$as_echo_n "checking for pkg-config or pkgconf... " >&6; }
+    if test -x "${PKG_CONFIG}" ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${PKG_CONFIG}" >&5
+$as_echo "${PKG_CONFIG}" >&6; }
+        case "${PKG_CONFIG}" in
+        *pkgconf)
+            _min_version="1.3.0"
+            ;;
+        *pkg-config)
+            _min_version="0.23"
+            ;;
+        *)
+            _min_version="9.9.error"
+            ;;
+        esac
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking that ${PKG_CONFIG} is at least version ${_min_version}" >&5
+$as_echo_n "checking that ${PKG_CONFIG} is at least version ${_min_version}... " >&6; }
+        _act_version=`"${PKG_CONFIG}" --version`
+        if ! "${PKG_CONFIG}" --atleast-pkgconfig-version="${_min_version}" ; then
+            PKG_CONFIG=""
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_act_version}" >&5
+$as_echo "${_act_version}" >&6; }
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        PKG_CONFIG=""
+    fi
+    if test x"${PKG_CONFIG}" = x"" ; then
+        as_fn_error $? "pkg-config was not found or is too old" "$LINENO" 5
+    fi
+
+# Check whether --with-pkgconfigdir was given.
+if test "${with_pkgconfigdir+set}" = set; then :
+  withval=$with_pkgconfigdir; pkgconfigdir=$withval
+else
+  pkgconfigdir='${libdir}/pkgconfig'
+fi
+
+    pkgconfigdir=$pkgconfigdir
+
+
+
 # other programs
 
 
 LIB_MAJ=2
 
 
 cat >>confdefs.h <<_ACEOF
 #define LIB_MAJ $LIB_MAJ
 _ACEOF
 
 
 # Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
 $as_echo "#define OPENPAM_DEBUG 1" >>confdefs.h
 
 fi
 
 
 # Check whether --enable-unversioned-modules was given.
 if test "${enable_unversioned_modules+set}" = set; then :
   enableval=$enable_unversioned_modules; if test x"$enableval" = x"no"; then :
 
 
 $as_echo "#define DISABLE_UNVERSIONED_MODULES 1" >>confdefs.h
 
 
 fi
 fi
 
 
 
 # Check whether --with-modules-dir was given.
 if test "${with_modules_dir+set}" = set; then :
   withval=$with_modules_dir; if test x"$withval" != x"no"; then :
 
 	OPENPAM_MODULES_DIR="$withval"
 
 cat >>confdefs.h <<_ACEOF
 #define OPENPAM_MODULES_DIR "${OPENPAM_MODULES_DIR%/}"
 _ACEOF
 
 
 fi
 fi
 
 
  if test x"$OPENPAM_MODULES_DIR" != x""; then
   CUSTOM_MODULES_DIR_TRUE=
   CUSTOM_MODULES_DIR_FALSE='#'
 else
   CUSTOM_MODULES_DIR_TRUE='#'
   CUSTOM_MODULES_DIR_FALSE=
 fi
 
 
 
 # Check whether --with-doc was given.
 if test "${with_doc+set}" = set; then :
   withval=$with_doc;
 else
   with_doc=yes
 fi
 
  if test x"$with_doc" = x"yes"; then
   WITH_DOC_TRUE=
   WITH_DOC_FALSE='#'
 else
   WITH_DOC_TRUE='#'
   WITH_DOC_FALSE=
 fi
 
 
 
 # Check whether --with-pam-unix was given.
 if test "${with_pam_unix+set}" = set; then :
   withval=$with_pam_unix;
 else
   with_pam_unix=no
 fi
 
  if test x"$with_pam_unix" = x"yes"; then
   WITH_PAM_UNIX_TRUE=
   WITH_PAM_UNIX_FALSE='#'
 else
   WITH_PAM_UNIX_TRUE='#'
   WITH_PAM_UNIX_FALSE=
 fi
 
 
 
 # Check whether --with-pamtest was given.
 if test "${with_pamtest+set}" = set; then :
   withval=$with_pamtest;
 else
   with_pamtest=no
 fi
 
  if test x"$with_pamtest" = x"yes"; then
   WITH_PAMTEST_TRUE=
   WITH_PAMTEST_FALSE='#'
 else
   WITH_PAMTEST_TRUE='#'
   WITH_PAMTEST_FALSE=
 fi
 
 
 
 # Check whether --with-su was given.
 if test "${with_su+set}" = set; then :
   withval=$with_su;
 else
   with_su=no
 fi
 
  if test x"$with_su" = x"yes"; then
   WITH_SU_TRUE=
   WITH_SU_FALSE='#'
 else
   WITH_SU_TRUE='#'
   WITH_SU_FALSE=
 fi
 
 
 
 # Check whether --with-system-libpam was given.
 if test "${with_system_libpam+set}" = set; then :
   withval=$with_system_libpam;
 else
   with_system_libpam=no
 fi
 
  if test x"$with_system_libpam" = x"yes"; then
   WITH_SYSTEM_LIBPAM_TRUE=
   WITH_SYSTEM_LIBPAM_FALSE='#'
 else
   WITH_SYSTEM_LIBPAM_TRUE='#'
   WITH_SYSTEM_LIBPAM_FALSE=
 fi
 
 
 for ac_header in crypt.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
 if test "x$ac_cv_header_crypt_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_CRYPT_H 1
 _ACEOF
 
 fi
 
 done
 
 
 for ac_func in asprintf vasprintf
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 for ac_func in dlfunc fdlopen
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 for ac_func in fpurge
 do :
   ac_fn_c_check_func "$LINENO" "fpurge" "ac_cv_func_fpurge"
 if test "x$ac_cv_func_fpurge" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FPURGE 1
 _ACEOF
 
 fi
 done
 
 for ac_func in setlogmask
 do :
   ac_fn_c_check_func "$LINENO" "setlogmask" "ac_cv_func_setlogmask"
 if test "x$ac_cv_func_setlogmask" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SETLOGMASK 1
 _ACEOF
 
 fi
 done
 
 for ac_func in strlcat strlcmp strlcpy strlset
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
 
 saved_LIBS="${LIBS}"
 LIBS=""
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
 if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char dlopen ();
 int
 main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
   ac_cv_lib_dl_dlopen=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
 if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDL 1
 _ACEOF
 
   LIBS="-ldl $LIBS"
 
 fi
 
 DL_LIBS="${LIBS}"
 LIBS="${saved_LIBS}"
 
 
 saved_LIBS="${LIBS}"
 LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if ${ac_cv_lib_crypt_crypt+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char crypt ();
-int
-main ()
-{
-return crypt ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_crypt_crypt=yes
-else
-  ac_cv_lib_crypt_crypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPT 1
-_ACEOF
-
-  LIBS="-lcrypt $LIBS"
-
-fi
-
-CRYPT_LIBS="${LIBS}"
-LIBS="${saved_LIBS}"
-
-
-saved_LIBS="${LIBS}"
-LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HMAC_CTX_init in -lcrypto" >&5
-$as_echo_n "checking for HMAC_CTX_init in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_HMAC_CTX_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypto  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char HMAC_CTX_init ();
-int
-main ()
-{
-return HMAC_CTX_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_crypto_HMAC_CTX_init=yes
-else
-  ac_cv_lib_crypto_HMAC_CTX_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_HMAC_CTX_init" >&5
-$as_echo "$ac_cv_lib_crypto_HMAC_CTX_init" >&6; }
-if test "x$ac_cv_lib_crypto_HMAC_CTX_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPTO 1
-_ACEOF
-
-  LIBS="-lcrypto $LIBS"
-
-fi
-
-CRYPTO_LIBS="${LIBS}"
-LIBS="${saved_LIBS}"
-
-
-saved_LIBS="${LIBS}"
-LIBS=""
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
 $as_echo_n "checking for pam_start in -lpam... " >&6; }
 if ${ac_cv_lib_pam_pam_start+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
 char pam_start ();
 int
 main ()
 {
 return pam_start ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pam_pam_start=yes
 else
   ac_cv_lib_pam_pam_start=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
 $as_echo "$ac_cv_lib_pam_pam_start" >&6; }
 if test "x$ac_cv_lib_pam_pam_start" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPAM 1
 _ACEOF
 
   LIBS="-lpam $LIBS"
 
 fi
 
 SYSTEM_LIBPAM="${LIBS}"
 LIBS="${saved_LIBS}"
 
 
-save_LIBS="${LIBS}"
-LIBS=""
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cryb_test_version" >&5
-$as_echo_n "checking for library containing cryb_test_version... " >&6; }
-if ${ac_cv_search_cryb_test_version+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
 
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char cryb_test_version ();
-int
-main ()
-{
-return cryb_test_version ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' cryb-test; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_cryb_test_version=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_cryb_test_version+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_cryb_test_version+:} false; then :
 
-else
-  ac_cv_search_cryb_test_version=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_cryb_test_version" >&5
-$as_echo "$ac_cv_search_cryb_test_version" >&6; }
-ac_res=$ac_cv_search_cryb_test_version
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-  CRYB_TEST_LIBS="${LIBS}"
 
-else
 
-  CRYB_TEST_LIBS=""
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cryb-test library not available, unit tests disabled" >&5
-$as_echo "$as_me: WARNING: cryb-test library not available, unit tests disabled" >&2;}
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if cryb-test is installed" >&5
+$as_echo_n "checking if cryb-test is installed... " >&6; }
+    if { { $as_echo "$as_me:${as_lineno-$LINENO}: \"\${PKG_CONFIG}\" --exists --print-errors \"cryb-test\""; } >&5
+  ("${PKG_CONFIG}" --exists --print-errors "cryb-test") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } ; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+        ax_pc_cv_have_cryb_test=yes
+
+$as_echo "#define HAVE_CRYB_TEST 1" >>confdefs.h
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking cryb-test version" >&5
+$as_echo_n "checking cryb-test version... " >&6; }
+
+
+
+    ax_pc_cv_cryb_test_version=`"${PKG_CONFIG}" --modversion cryb-test`
+
+        CRYB_TEST_VERSION=$ax_pc_cv_cryb_test_version
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ax_pc_cv_cryb_test_version:-unknown}" >&5
+$as_echo "${ax_pc_cv_cryb_test_version:-unknown}" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking cryb-test compiler flags" >&5
+$as_echo_n "checking cryb-test compiler flags... " >&6; }
+
+
+
+    ax_pc_cv_cryb_test_cflags=`"${PKG_CONFIG}" --cflags cryb-test`
+
+        CRYB_TEST_CFLAGS=$ax_pc_cv_cryb_test_cflags
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ax_pc_cv_cryb_test_cflags:-none}" >&5
+$as_echo "${ax_pc_cv_cryb_test_cflags:-none}" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking cryb-test linker flags" >&5
+$as_echo_n "checking cryb-test linker flags... " >&6; }
+
+
+
+    ax_pc_cv_cryb_test_libs=`"${PKG_CONFIG}" --libs cryb-test`
+
+        CRYB_TEST_LIBS=$ax_pc_cv_cryb_test_libs
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ax_pc_cv_cryb_test_libs:-none}" >&5
+$as_echo "${ax_pc_cv_cryb_test_libs:-none}" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: Cryb test framework found, unit tests enabled." >&5
+$as_echo "$as_me: Cryb test framework found, unit tests enabled." >&6;}
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        ax_pc_cv_have_cryb_test=no
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cryb test framework not found, unit tests disabled." >&5
+$as_echo "$as_me: WARNING: Cryb test framework not found, unit tests disabled." >&2;}
+    fi
+
+         if test x"$ax_pc_cv_have_cryb_test" = x"yes"; then
+  HAVE_CRYB_TEST_TRUE=
+  HAVE_CRYB_TEST_FALSE='#'
+else
+  HAVE_CRYB_TEST_TRUE='#'
+  HAVE_CRYB_TEST_FALSE=
 fi
 
-LIBS="${save_LIBS}"
 
- if  test x"$CRYB_TEST_LIBS" != x"" ; then
+
+ if test x"$CRYB_TEST_LIBS" != x""; then
   WITH_TEST_TRUE=
   WITH_TEST_FALSE='#'
 else
   WITH_TEST_TRUE='#'
   WITH_TEST_FALSE=
 fi
 
 
 # Check whether --enable-developer-warnings was given.
 if test "${enable_developer_warnings+set}" = set; then :
   enableval=$enable_developer_warnings; CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual"
 fi
 
 # Check whether --enable-debugging-symbols was given.
 if test "${enable_debugging_symbols+set}" = set; then :
   enableval=$enable_debugging_symbols; CFLAGS="${CFLAGS} -O0 -g -fno-inline"
 fi
 
 # Check whether --enable-werror was given.
 if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; CFLAGS="${CFLAGS} -Werror"
 fi
 
 
 ac_config_files="$ac_config_files Makefile bin/Makefile bin/openpam_dump_policy/Makefile bin/pamtest/Makefile bin/su/Makefile doc/Makefile doc/man/Makefile include/Makefile include/security/Makefile lib/Makefile lib/libpam/Makefile misc/Makefile modules/Makefile modules/pam_deny/Makefile modules/pam_permit/Makefile modules/pam_return/Makefile modules/pam_unix/Makefile t/Makefile"
 
 ac_config_files="$ac_config_files mkpkgng"
 
 ac_config_files="$ac_config_files misc/coverage.sh"
 
 ac_config_files="$ac_config_files misc/coverity.sh"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # scripts and configure runs, see configure's option --config-cache.
 # It is not useful on other systems.  If it contains results you don't
 # want to keep, you may remove or edit it.
 #
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
 # `ac_cv_env_foo' variables (set or unset) will be overridden when
 # loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
 _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
 # So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
 (
   for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
     eval ac_val=\$$ac_var
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
       *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
       *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
 
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
       # `set' does not quote correctly, so add quotes: double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
       ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
     sort
 ) |
   sed '
      /^ac_cv_env_/b end
      t clear
      :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
         case $cache_file in #(
         */* | ?:*)
 	  mv -f confcache "$cache_file"$$ &&
 	  mv -f "$cache_file"$$ "$cache_file" ;; #(
         *)
 	  mv -f confcache "$cache_file" ;;
 	esac
       fi
     fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
 DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
   as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
 LTLIBOBJS=$ac_ltlibobjs
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
 $as_echo_n "checking that generated files are newer than configure... " >&6; }
    if test -n "$am_sleep_pid"; then
      # Hide warnings about reused PIDs.
      wait $am_sleep_pid 2>/dev/null
    fi
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
 $as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
 else
   am__EXEEXT_TRUE='#'
   am__EXEEXT_FALSE=
 fi
 
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${CUSTOM_MODULES_DIR_TRUE}" && test -z "${CUSTOM_MODULES_DIR_FALSE}"; then
   as_fn_error $? "conditional \"CUSTOM_MODULES_DIR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_DOC_TRUE}" && test -z "${WITH_DOC_FALSE}"; then
   as_fn_error $? "conditional \"WITH_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_PAM_UNIX_TRUE}" && test -z "${WITH_PAM_UNIX_FALSE}"; then
   as_fn_error $? "conditional \"WITH_PAM_UNIX\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_PAMTEST_TRUE}" && test -z "${WITH_PAMTEST_FALSE}"; then
   as_fn_error $? "conditional \"WITH_PAMTEST\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_SU_TRUE}" && test -z "${WITH_SU_FALSE}"; then
   as_fn_error $? "conditional \"WITH_SU\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WITH_SYSTEM_LIBPAM_TRUE}" && test -z "${WITH_SYSTEM_LIBPAM_FALSE}"; then
   as_fn_error $? "conditional \"WITH_SYSTEM_LIBPAM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_CRYB_TEST_TRUE}" && test -z "${HAVE_CRYB_TEST_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_CRYB_TEST\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_TEST_TRUE}" && test -z "${WITH_TEST_FALSE}"; then
   as_fn_error $? "conditional \"WITH_TEST\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 { $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.
 
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
 
 SHELL=\${CONFIG_SHELL-$SHELL}
 export SHELL
 _ASEOF
 cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
   case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
 esac
 fi
 
 
 as_nl='
 '
 export as_nl
 # Printing a long string crashes Solaris 7 /usr/bin/printf.
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 # Prefer a ksh shell builtin over an external printf program on Solaris,
 # but without wasting forks for bash or zsh.
 if test -z "$BASH_VERSION$ZSH_VERSION" \
     && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='print -r --'
   as_echo_n='print -rn --'
 elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
   if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
     as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
     as_echo_n='/usr/ucb/echo -n'
   else
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
       case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
       esac;
       expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
     '
     export as_echo_n_body
     as_echo_n='sh -c $as_echo_n_body as_echo'
   fi
   export as_echo_body
   as_echo='sh -c $as_echo_body as_echo'
 fi
 
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
       PATH_SEPARATOR=';'
   }
 fi
 
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
      ;;
 esac
 # We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
 # Unset variables that we do not need and which cause bugs (e.g. in
 # pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
 # suppresses any "Segmentation fault" message there.  '((' could
 # trigger a bug in pdksh 5.2.14.
 for as_var in BASH_ENV ENV MAIL MAILPATH
 do eval test x\${$as_var+set} = xset \
   && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
 LC_ALL=C
 export LC_ALL
 LANGUAGE=C
 export LANGUAGE
 
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
 # ----------------------------------------
 # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
 # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
 # script with STATUS, using 1 if that was 0.
 as_fn_error ()
 {
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
     $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
   $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
 
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
 as_fn_set_status ()
 {
   return $1
 } # as_fn_set_status
 
 # as_fn_exit STATUS
 # -----------------
 # Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
 as_fn_exit ()
 {
   set +e
   as_fn_set_status $1
   exit $1
 } # as_fn_exit
 
 # as_fn_unset VAR
 # ---------------
 # Portably unset VAR.
 as_fn_unset ()
 {
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
 if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
 else
   as_fn_append ()
   {
     eval $1=\$$1\$2
   }
 fi # as_fn_append
 
 # as_fn_arith ARG...
 # ------------------
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
 if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
 else
   as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
   }
 fi # as_fn_arith
 
 
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
 if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
 if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
   as_dirname=dirname
 else
   as_dirname=false
 fi
 
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
 
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
   case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
   xy)  ECHO_C='\c';;
   *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
        ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
   mkdir conf$$.dir 2>/dev/null
 fi
 if (echo >conf$$.file) 2>/dev/null; then
   if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
     # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
     as_ln_s='cp -pR'
   fi
 else
   as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
 
 # as_fn_mkdir_p
 # -------------
 # Create "$as_dir" as a directory, including parents if necessary.
 as_fn_mkdir_p ()
 {
 
   case $as_dir in #(
   -*) as_dir=./$as_dir;;
   esac
   test -d "$as_dir" || eval $as_mkdir_p || {
     as_dirs=
     while :; do
       case $as_dir in #(
       *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
       as_dir=`$as_dirname -- "$as_dir" ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
   } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 
 
 } # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
 
 # as_fn_executable_p FILE
 # -----------------------
 # Test if FILE is an executable regular file.
 as_fn_executable_p ()
 {
   test -f "$1" && test -x "$1"
 } # as_fn_executable_p
 as_test_x='test -x'
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
 ## ----------------------------------- ##
 ## Main body of $CONFIG_STATUS script. ##
 ## ----------------------------------- ##
 _ASEOF
 test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenPAM $as_me 20170430, which was
+This file was extended by OpenPAM $as_me 20190224, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
 on `(hostname || uname -n) 2>/dev/null | sed 1q`
 "
 
 _ACEOF
 
 case $ac_config_files in *"
 "*) set x $ac_config_files; shift; ac_config_files=$*;;
 esac
 
 case $ac_config_headers in *"
 "*) set x $ac_config_headers; shift; ac_config_headers=$*;;
 esac
 
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
 config_files="$ac_config_files"
 config_headers="$ac_config_headers"
 config_commands="$ac_config_commands"
 
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
 \`$as_me' instantiates files and other configuration actions
 from templates according to the current configuration.  Unless the files
 and actions are specified as TAGs, all are instantiated by default.
 
 Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
       --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
       --file=FILE[:TEMPLATE]
                    instantiate the configuration file FILE
       --header=FILE[:TEMPLATE]
                    instantiate the configuration header FILE
 
 Configuration files:
 $config_files
 
 Configuration headers:
 $config_headers
 
 Configuration commands:
 $config_commands
 
 Report bugs to <des@des.no>.
 OpenPAM home page: <http://www.openpam.org/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenPAM config.status 20170430
+OpenPAM config.status 20190224
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
 ac_pwd='$ac_pwd'
 srcdir='$srcdir'
 INSTALL='$INSTALL'
 MKDIR_P='$MKDIR_P'
 AWK='$AWK'
 test -n "\$AWK" || AWK=awk
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
   --*=?*)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
     ac_shift=:
     ;;
   --*=)
     ac_option=`expr "X$1" : 'X\([^=]*\)='`
     ac_optarg=
     ac_shift=:
     ;;
   *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
   esac
 
   case $ac_option in
   # Handling of the options.
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
     $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
     as_fn_error $? "ambiguous option: \`$1'
 Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
   -*) as_fn_error $? "unrecognized option: \`$1'
 Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
   shift
 done
 
 ac_configure_extra_args=
 
 if $ac_cs_silent; then
   exec 6>/dev/null
   ac_configure_extra_args="$ac_configure_extra_args --silent"
 fi
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
 fi
 
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
   $as_echo "$ac_log"
 } >&5
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
 # INIT-COMMANDS
 #
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
 
 
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
 macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
 macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
 enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
 enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
 pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
 PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
 build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
 build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
 build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
 SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
 Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
 GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
 EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
 FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
 LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
 NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
 LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
 max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
 ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
 exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
 lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
 lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
 lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
 lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
 reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
 reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
 OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
 deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
 file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
 file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
 want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
 DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
 sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
 AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
 AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
 archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
 STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
 RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
 old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
 old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
 old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
 lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
 CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
 CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
 compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
 GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
 lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
 nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
 lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
 lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
 objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
 MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
 lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
 lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
 need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
 MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
 DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
 NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
 LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
 OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
 OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
 libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
 shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
 extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
 archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
 enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
 export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
 whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
 compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
 old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
 old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
 archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
 archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
 module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
 module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
 with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
 hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
 hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
 hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
 inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
 link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
 always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
 export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
 exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
 include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
 prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
 postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
 file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
 variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
 need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
 need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
 version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
 runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
 shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
 shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
 libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
 library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
 soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
 install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
 postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
 postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
 finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
 finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
 hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
 sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
 configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`'
 configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`'
 hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
 enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
 enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
 old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
 striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
 # A function that is used when there is no print builtin or printf.
 func_fallback_echo ()
 {
   eval 'cat <<_LTECHO_EOF
 \$1
 _LTECHO_EOF'
 }
 
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
 PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
 FGREP \
 LD \
 NM \
 LN_S \
 lt_SP2NL \
 lt_NL2SP \
 reload_flag \
 OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
 file_magic_glob \
 want_nocaseglob \
 DLLTOOL \
 sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
 archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
 CFLAGS \
 compiler \
 lt_cv_sys_global_symbol_pipe \
 lt_cv_sys_global_symbol_to_cdecl \
 lt_cv_sys_global_symbol_to_import \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
 lt_cv_nm_interface \
 nm_file_list_spec \
 lt_cv_truncate_bin \
 lt_prog_compiler_no_builtin_flag \
 lt_prog_compiler_pic \
 lt_prog_compiler_wl \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
 MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
 OTOOL \
 OTOOL64 \
 shrext_cmds \
 export_dynamic_flag_spec \
 whole_archive_flag_spec \
 compiler_needs_object \
 with_gnu_ld \
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
 variables_saved_for_relink \
 libname_spec \
 library_names_spec \
 soname_spec \
 install_override_mode \
 finish_eval \
 old_striplib \
 striplib; do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
       ;;
     esac
 done
 
 # Double-quote double-evaled strings.
 for var in reload_cmds \
 old_postinstall_cmds \
 old_postuninstall_cmds \
 old_archive_cmds \
 extract_expsyms_cmds \
 old_archive_from_new_cmds \
 old_archive_from_expsyms_cmds \
 archive_cmds \
 archive_expsym_cmds \
 module_cmds \
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
 postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
 configure_time_dlsearch_path \
 configure_time_lt_sys_library_path; do
     case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
       eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
       ;;
     esac
 done
 
 ac_aux_dir='$ac_aux_dir'
 
 # See if we are running on zsh, and set the options that allow our
 # commands through without removal of \ escapes INIT.
 if test -n "\${ZSH_VERSION+set}"; then
    setopt NO_GLOB_SUBST
 fi
 
 
     PACKAGE='$PACKAGE'
     VERSION='$VERSION'
     RM='$RM'
     ofile='$ofile'
 
 
 
 
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
     "bin/openpam_dump_policy/Makefile") CONFIG_FILES="$CONFIG_FILES bin/openpam_dump_policy/Makefile" ;;
     "bin/pamtest/Makefile") CONFIG_FILES="$CONFIG_FILES bin/pamtest/Makefile" ;;
     "bin/su/Makefile") CONFIG_FILES="$CONFIG_FILES bin/su/Makefile" ;;
     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
     "doc/man/Makefile") CONFIG_FILES="$CONFIG_FILES doc/man/Makefile" ;;
     "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
     "include/security/Makefile") CONFIG_FILES="$CONFIG_FILES include/security/Makefile" ;;
     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
     "lib/libpam/Makefile") CONFIG_FILES="$CONFIG_FILES lib/libpam/Makefile" ;;
     "misc/Makefile") CONFIG_FILES="$CONFIG_FILES misc/Makefile" ;;
     "modules/Makefile") CONFIG_FILES="$CONFIG_FILES modules/Makefile" ;;
     "modules/pam_deny/Makefile") CONFIG_FILES="$CONFIG_FILES modules/pam_deny/Makefile" ;;
     "modules/pam_permit/Makefile") CONFIG_FILES="$CONFIG_FILES modules/pam_permit/Makefile" ;;
     "modules/pam_return/Makefile") CONFIG_FILES="$CONFIG_FILES modules/pam_return/Makefile" ;;
     "modules/pam_unix/Makefile") CONFIG_FILES="$CONFIG_FILES modules/pam_unix/Makefile" ;;
     "t/Makefile") CONFIG_FILES="$CONFIG_FILES t/Makefile" ;;
     "mkpkgng") CONFIG_FILES="$CONFIG_FILES mkpkgng" ;;
     "misc/coverage.sh") CONFIG_FILES="$CONFIG_FILES misc/coverage.sh" ;;
     "misc/coverity.sh") CONFIG_FILES="$CONFIG_FILES misc/coverity.sh" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
 
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
 # simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
 # Hook for its removal unless debugging.
 # Note that there is a small window in which the directory will not be cleaned:
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
   tmp= ac_tmp=
   trap 'exit_status=$?
   : "${ac_tmp:=$tmp}"
   { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
 ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
 # This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
 
 ac_cr=`echo X | tr X '\015'`
 # On cygwin, bash can eat \r inside `` if the user requested igncr.
 # But we know of no other shell where ac_cr would be empty at this
 # point, so we can use a bashism as a fallback.
 if test "x$ac_cr" = x; then
   eval ac_cr=\$\'\\r\'
 fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
   ac_cs_awk_cr='\\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
 
 echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
 {
   echo "cat >conf$$subs.awk <<_ACEOF" &&
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
   as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
 s/^/S["/; s/!.*/"]=/
 p
 g
 s/^[^!]*!//
 :repl
 t repl
 s/'"$ac_delim"'$//
 t delim
 :nl
 h
 s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
 n
 b repl
 :more1
 s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 p
 g
 s/.\{148\}//
 t nl
 :delim
 h
 s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
 b
 :more2
 s/["\\]/\\&/g; s/^/"/; s/$/"\\/
 p
 g
 s/.\{148\}//
 t delim
 ' <conf$$subs.awk | sed '
 /^[^""]/{
   N
   s/\n//
 }
 ' >>$CONFIG_STATUS || ac_write_fail=1
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
 cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
 }
 {
   line = $ 0
   nfields = split(line, field, "@")
   substed = 0
   len = length(field[1])
   for (i = 2; i < nfields; i++) {
     key = field[i]
     keylen = length(key)
     if (S_is_set[key]) {
       value = S[key]
       line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
       len += length(value) + length(field[++i])
       substed = 1
     } else
       len += 1 + keylen
   }
 
   print line
 }
 
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
 fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove sole $(srcdir),
 # ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" = x.; then
   ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
 h
 s///
 s/^/:/
 s/[	 ]*$/:/
 s/:\$(srcdir):/:/g
 s/:\${srcdir}:/:/g
 s/:@srcdir@:/:/g
 s/^:*//
 s/:*$//
 x
 s/\(=[	 ]*\).*/\1/
 G
 s/\n//
 s/^[^=]*=[	 ]*$//
 }'
 fi
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 fi # test -n "$CONFIG_FILES"
 
 # Set up the scripts for CONFIG_HEADERS section.
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
 cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
 # Transform confdefs.h into an awk script `defines.awk', embedded as
 # here-document in config.status, that substitutes the proper values into
 # config.h.in to produce config.h.
 
 # Create a delimiter string that does not exist in confdefs.h, to ease
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
   ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
   if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
 
 # For the awk script, D is an array of macro values keyed by name,
 # likewise P contains macro parameters if any.  Preserve backslash
 # newline sequences.
 
 ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
 sed -n '
 s/.\{148\}/&'"$ac_delim"'/g
 t rset
 :rset
 s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
 t def
 d
 :def
 s/\\$//
 t bsnl
 s/["\\]/\\&/g
 s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
 D["\1"]=" \3"/p
 s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
 d
 :bsnl
 s/["\\]/\\&/g
 s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
 D["\1"]=" \3\\\\\\n"\\/p
 t cont
 s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
 t cont
 d
 :cont
 n
 s/.\{148\}/&'"$ac_delim"'/g
 t clear
 :clear
 s/\\$//
 t bsnlc
 s/["\\]/\\&/g; s/^/"/; s/$/"/p
 d
 :bsnlc
 s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
 b cont
 ' <confdefs.h | sed '
 s/'"$ac_delim"'/"\\\
 "/g' >>$CONFIG_STATUS || ac_write_fail=1
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   for (key in D) D_is_set[key] = 1
   FS = ""
 }
 /^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
   line = \$ 0
   split(line, arg, " ")
   if (arg[1] == "#") {
     defundef = arg[2]
     mac1 = arg[3]
   } else {
     defundef = substr(arg[1], 2)
     mac1 = arg[2]
   }
   split(mac1, mac2, "(") #)
   macro = mac2[1]
   prefix = substr(line, 1, index(line, defundef) - 1)
   if (D_is_set[macro]) {
     # Preserve the white space surrounding the "#".
     print prefix "define", macro P[macro] D[macro]
     next
   } else {
     # Replace #undef with comments.  This is necessary, for example,
     # in the case of _POSIX_SOURCE, which is predefined and required
     # on some systems where configure will not decide to define it.
     if (defundef == "undef") {
       print "/*", prefix defundef, macro, "*/"
       next
     }
   }
 }
 { print }
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
   as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
 eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
 shift
 for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
   :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
   ac_save_IFS=$IFS
   IFS=:
   set x $ac_tag
   IFS=$ac_save_IFS
   shift
   ac_file=$1
   shift
 
   case $ac_mode in
   :L) ac_source=$1;;
   :[FH])
     ac_file_inputs=
     for ac_f
     do
       case $ac_f in
       -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
 	 test -f "$ac_f" ||
 	   case $ac_f in
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
 	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
     configure_input='Generated from '`
 	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
       { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
        ac_sed_conf_input=`$as_echo "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
 
     case $ac_tag in
     *:-:* | *:-) cat >"$ac_tmp/stdin" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
 
   ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
   as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
   ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
   ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
   esac ;;
 esac
 ac_abs_top_builddir=$ac_pwd
 ac_abs_builddir=$ac_pwd$ac_dir_suffix
 # for backward compatibility:
 ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
   .)  # We are building in place.
     ac_srcdir=.
     ac_top_srcdir=$ac_top_builddir_sub
     ac_abs_top_srcdir=$ac_pwd ;;
   [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
     ac_top_srcdir=$srcdir
     ac_abs_top_srcdir=$srcdir ;;
   *) # Relative name.
     ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
     ac_top_srcdir=$ac_top_build_prefix$srcdir
     ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 
   case $ac_mode in
   :F)
   #
   # CONFIG_FILE
   #
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
   ac_MKDIR_P=$MKDIR_P
   case $MKDIR_P in
   [\\/$]* | ?:[\\/]* ) ;;
   */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
   esac
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
 ac_sed_dataroot='
 /datarootdir/ {
   p
   q
 }
 /@datadir@/p
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
   s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
 # Neutralize VPATH when `$srcdir' = `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
 s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
 s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
 s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
 s&@builddir@&$ac_builddir&;t t
 s&@abs_builddir@&$ac_abs_builddir&;t t
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
   >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
   case $ac_file in
   -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
   *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
     $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
 echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
 $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$_am_arg" : 'X\(//\)[^/]' \| \
 	 X"$_am_arg" : 'X\(//\)$' \| \
 	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
 $as_echo X"$_am_arg" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
   :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
   # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
+  # TODO: see whether this extra hack can be removed once we start
+  # requiring Autoconf 2.70 or later.
+  case $CONFIG_FILES in #(
+  *\'*) :
+    eval set x "$CONFIG_FILES" ;; #(
+  *) :
+    set x $CONFIG_FILES ;; #(
+  *) :
+     ;;
+esac
   shift
-  for mf
+  # Used to flag and report bootstrapping failures.
+  am_rc=0
+  for am_mf
   do
     # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named 'Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
+    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile which includes
+    # dependency-tracking related rules and includes.
+    # Grep'ing the whole file directly is not great: AIX grep has a line
     # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
+    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
+      || continue
+    am_dirpart=`$as_dirname -- "$am_mf" ||
+$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$am_mf" : 'X\(//\)[^/]' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$am_mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)[^/].*/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
 	  /^X\(\/\).*/{
 	    s//\1/
 	    q
 	  }
 	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running 'make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "$am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+    am_filepart=`$as_basename -- "$am_mf" ||
+$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$am_mf" : 'X\(//\)$' \| \
+	 X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$am_mf" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)[^/].*/{
+	  /^X\/\(\/\/\)$/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\/\)$/{
+	  /^X\/\(\/\).*/{
 	    s//\1/
 	    q
 	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
 	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
+    { echo "$as_me:$LINENO: cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles" >&5
+   (cd "$am_dirpart" \
+      && sed -e '/# am--include-marker/d' "$am_filepart" \
+        | $MAKE -f - am--depfiles) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } || am_rc=$?
   done
+  if test $am_rc -ne 0; then
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Something went wrong bootstrapping makefile fragments
+    for automatic dependency tracking.  Try re-running configure with the
+    '--disable-dependency-tracking' option to at least be able to build
+    the package (albeit without support for automatic dependency tracking).
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+  { am_dirpart=; unset am_dirpart;}
+  { am_filepart=; unset am_filepart;}
+  { am_mf=; unset am_mf;}
+  { am_rc=; unset am_rc;}
+  rm -f conftest-deps.mk
 }
  ;;
     "libtool":C)
 
     # See if we are running on zsh, and set the options that allow our
     # commands through without removal of \ escapes.
     if test -n "${ZSH_VERSION+set}"; then
       setopt NO_GLOB_SUBST
     fi
 
     cfgfile=${ofile}T
     trap "$RM \"$cfgfile\"; exit 1" 1 2 15
     $RM "$cfgfile"
 
     cat <<_LT_EOF >> "$cfgfile"
 #! $SHELL
 # Generated automatically by $as_me ($PACKAGE) $VERSION
 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit, 1996
 
 # Copyright (C) 2014 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 # GNU Libtool is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of of the License, or
 # (at your option) any later version.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program or library that is built
 # using GNU Libtool, you may include this file under the  same
 # distribution terms that you use for the rest of that program.
 #
 # GNU Libtool is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 # The names of the tagged configurations supported by this script.
 available_tags=''
 
 # Configured defaults for sys_lib_dlsearch_path munging.
 : \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
 
 # ### BEGIN LIBTOOL CONFIG
 
 # Which release of libtool.m4 was used?
 macro_version=$macro_version
 macro_revision=$macro_revision
 
 # Whether or not to build static libraries.
 build_old_libs=$enable_static
 
 # Whether or not to build shared libraries.
 build_libtool_libs=$enable_shared
 
 # What type of objects to build.
 pic_mode=$pic_mode
 
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
 # Shared archive member basename,for filename based shared library versioning on AIX.
 shared_archive_member_spec=$shared_archive_member_spec
 
 # Shell to use when invoking shell scripts.
 SHELL=$lt_SHELL
 
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
 # The PATH separator for the build system.
 PATH_SEPARATOR=$lt_PATH_SEPARATOR
 
 # The host system.
 host_alias=$host_alias
 host=$host
 host_os=$host_os
 
 # The build system.
 build_alias=$build_alias
 build=$build
 build_os=$build_os
 
 # A sed program that does not truncate output.
 SED=$lt_SED
 
 # Sed that helps us avoid accidentally triggering echo(1) options like -n.
 Xsed="\$SED -e 1s/^X//"
 
 # A grep program that handles long lines.
 GREP=$lt_GREP
 
 # An ERE matcher.
 EGREP=$lt_EGREP
 
 # A literal string matcher.
 FGREP=$lt_FGREP
 
 # A BSD- or MS-compatible name lister.
 NM=$lt_NM
 
 # Whether we need soft or hard links.
 LN_S=$lt_LN_S
 
 # What is the maximum length of a command?
 max_cmd_len=$max_cmd_len
 
 # Object file suffix (normally "o").
 objext=$ac_objext
 
 # Executable file suffix (normally "").
 exeext=$exeext
 
 # whether the shell understands "unset".
 lt_unset=$lt_unset
 
 # turn spaces into newlines.
 SP2NL=$lt_lt_SP2NL
 
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
 # convert \$build file names to \$host format.
 to_host_file_cmd=$lt_cv_to_host_file_cmd
 
 # convert \$build files to toolchain format.
 to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
 
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
 # Command to use when deplibs_check_method = "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
 # How to find potential files when deplibs_check_method = "file_magic".
 file_magic_glob=$lt_file_magic_glob
 
 # Find potential files using nocaseglob when deplibs_check_method = "file_magic".
 want_nocaseglob=$lt_want_nocaseglob
 
 # DLL creation program.
 DLLTOOL=$lt_DLLTOOL
 
 # Command to associate shared and link libraries.
 sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
 
 # The archiver.
 AR=$lt_AR
 
 # Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
 # How to feed a file listing to the archiver.
 archiver_list_spec=$lt_archiver_list_spec
 
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
 # Commands used to install an old-style archive.
 RANLIB=$lt_RANLIB
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
 # Whether to use a lock for old archive extraction.
 lock_old_archive_extraction=$lock_old_archive_extraction
 
 # A C compiler.
 LTCC=$lt_CC
 
 # LTCC compiler flags.
 LTCFLAGS=$lt_CFLAGS
 
 # Take the output of nm and produce a listing of raw symbols and C names.
 global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
 
 # Transform the output of nm in a proper C declaration.
 global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
 
 # Transform the output of nm into a list of symbols to manually relocate.
 global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import
 
 # Transform the output of nm in a C name address pair.
 global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
 
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
 # The name lister interface.
 nm_interface=$lt_lt_cv_nm_interface
 
 # Specify filename containing input files for \$NM.
 nm_file_list_spec=$lt_nm_file_list_spec
 
 # The root where to search for dependent libraries,and where our libraries should be installed.
 lt_sysroot=$lt_sysroot
 
 # Command to truncate a binary pipe.
 lt_truncate_bin=$lt_lt_cv_truncate_bin
 
 # The name of the directory that contains temporary libtool files.
 objdir=$objdir
 
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
 
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
 # Manifest tool.
 MANIFEST_TOOL=$lt_MANIFEST_TOOL
 
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
 # Tool to change global to local symbols on Mac OS X.
 NMEDIT=$lt_NMEDIT
 
 # Tool to manipulate fat objects and archives on Mac OS X.
 LIPO=$lt_LIPO
 
 # ldd/readelf like tool for Mach-O binaries on Mac OS X.
 OTOOL=$lt_OTOOL
 
 # ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
 OTOOL64=$lt_OTOOL64
 
 # Old archive suffix (normally "a").
 libext=$libext
 
 # Shared library suffix (normally ".so").
 shrext_cmds=$lt_shrext_cmds
 
 # The commands to extract the exported symbol list from a shared archive.
 extract_expsyms_cmds=$lt_extract_expsyms_cmds
 
 # Variables whose values should be saved in libtool wrapper scripts and
 # restored at link time.
 variables_saved_for_relink=$lt_variables_saved_for_relink
 
 # Do we need the "lib" prefix for modules?
 need_lib_prefix=$need_lib_prefix
 
 # Do we need a version for libraries?
 need_version=$need_version
 
 # Library versioning type.
 version_type=$version_type
 
 # Shared library runtime path variable.
 runpath_var=$runpath_var
 
 # Shared library path variable.
 shlibpath_var=$shlibpath_var
 
 # Is shlibpath searched before the hard-coded library search path?
 shlibpath_overrides_runpath=$shlibpath_overrides_runpath
 
 # Format of library name prefix.
 libname_spec=$lt_libname_spec
 
 # List of archive names.  First name is the real one, the rest are links.
 # The last name is the one that the linker finds with -lNAME
 library_names_spec=$lt_library_names_spec
 
 # The coded name of the library, if different from the real name.
 soname_spec=$lt_soname_spec
 
 # Permission mode override for installation of shared libraries.
 install_override_mode=$lt_install_override_mode
 
 # Command to use after installation of a shared archive.
 postinstall_cmds=$lt_postinstall_cmds
 
 # Command to use after uninstallation of a shared archive.
 postuninstall_cmds=$lt_postuninstall_cmds
 
 # Commands used to finish a libtool library installation in a directory.
 finish_cmds=$lt_finish_cmds
 
 # As "finish_cmds", except a single script fragment to be evaled but
 # not shown.
 finish_eval=$lt_finish_eval
 
 # Whether we should hardcode library paths into libraries.
 hardcode_into_libs=$hardcode_into_libs
 
 # Compile-time system search path for libraries.
 sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
 
 # Detected run-time system search path for libraries.
 sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path
 
 # Explicit LT_SYS_LIBRARY_PATH set during ./configure time.
 configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path
 
 # Whether dlopen is supported.
 dlopen_support=$enable_dlopen
 
 # Whether dlopen of programs is supported.
 dlopen_self=$enable_dlopen_self
 
 # Whether dlopen of statically linked programs is supported.
 dlopen_self_static=$enable_dlopen_self_static
 
 # Commands to strip libraries.
 old_striplib=$lt_old_striplib
 striplib=$lt_striplib
 
 
 # The linker used to build libraries.
 LD=$lt_LD
 
 # How to create reloadable object files.
 reload_flag=$lt_reload_flag
 reload_cmds=$lt_reload_cmds
 
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
 # A language specific compiler.
 CC=$lt_compiler
 
 # Is the compiler the GNU compiler?
 with_gcc=$GCC
 
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic
 
 # How to pass a linker flag through the compiler.
 wl=$lt_lt_prog_compiler_wl
 
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
 # Does compiler simultaneously support -c and -o options?
 compiler_c_o=$lt_lt_cv_prog_compiler_c_o
 
 # Whether or not to add -lc for building shared libraries.
 build_libtool_need_lc=$archive_cmds_need_lc
 
 # Whether or not to disallow shared libs when runtime libs are static.
 allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
 
 # Compiler flag to allow reflexive dlopens.
 export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
 
 # Compiler flag to generate shared objects directly from archives.
 whole_archive_flag_spec=$lt_whole_archive_flag_spec
 
 # Whether the compiler copes with passing no objects directly.
 compiler_needs_object=$lt_compiler_needs_object
 
 # Create an old-style archive from a shared archive.
 old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
 
 # Create a temporary old-style archive to link instead of a shared archive.
 old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
 
 # Commands used to build a shared archive.
 archive_cmds=$lt_archive_cmds
 archive_expsym_cmds=$lt_archive_expsym_cmds
 
 # Commands used to build a loadable module if different from building
 # a shared archive.
 module_cmds=$lt_module_cmds
 module_expsym_cmds=$lt_module_expsym_cmds
 
 # Whether we are building with GNU ld or not.
 with_gnu_ld=$lt_with_gnu_ld
 
 # Flag that allows shared libraries with undefined symbols to be built.
 allow_undefined_flag=$lt_allow_undefined_flag
 
 # Flag that enforces no undefined symbols.
 no_undefined_flag=$lt_no_undefined_flag
 
 # Flag to hardcode \$libdir into a binary during linking.
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
 # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary.
 hardcode_direct=$hardcode_direct
 
 # Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes
 # DIR into the resulting binary and the resulting library dependency is
 # "absolute",i.e impossible to change by setting \$shlibpath_var if the
 # library is relocated.
 hardcode_direct_absolute=$hardcode_direct_absolute
 
 # Set to "yes" if using the -LDIR flag during linking hardcodes DIR
 # into the resulting binary.
 hardcode_minus_L=$hardcode_minus_L
 
 # Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
 # into the resulting binary.
 hardcode_shlibpath_var=$hardcode_shlibpath_var
 
 # Set to "yes" if building a shared library automatically hardcodes DIR
 # into the library and all subsequent libraries and executables linked
 # against it.
 hardcode_automatic=$hardcode_automatic
 
 # Set to yes if linker adds runtime paths of dependent libraries
 # to runtime path list.
 inherit_rpath=$inherit_rpath
 
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
 # The commands to list exported symbols.
 export_symbols_cmds=$lt_export_symbols_cmds
 
 # Symbols that should not be listed in the preloaded symbols.
 exclude_expsyms=$lt_exclude_expsyms
 
 # Symbols that must always be exported.
 include_expsyms=$lt_include_expsyms
 
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
 # Commands necessary for finishing linking programs.
 postlink_cmds=$lt_postlink_cmds
 
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
 # How to hardcode a shared library path into an executable.
 hardcode_action=$hardcode_action
 
 # ### END LIBTOOL CONFIG
 
 _LT_EOF
 
     cat <<'_LT_EOF' >> "$cfgfile"
 
 # ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
 
 # func_munge_path_list VARIABLE PATH
 # -----------------------------------
 # VARIABLE is name of variable containing _space_ separated list of
 # directories to be munged by the contents of PATH, which is string
 # having a format:
 # "DIR[:DIR]:"
 #       string "DIR[ DIR]" will be prepended to VARIABLE
 # ":DIR[:DIR]"
 #       string "DIR[ DIR]" will be appended to VARIABLE
 # "DIRP[:DIRP]::[DIRA:]DIRA"
 #       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
 #       "DIRA[ DIRA]" will be appended to VARIABLE
 # "DIR[:DIR]"
 #       VARIABLE will be replaced by "DIR[ DIR]"
 func_munge_path_list ()
 {
     case x$2 in
     x)
         ;;
     *:)
         eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\"
         ;;
     x:*)
         eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
         ;;
     *::*)
         eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
         eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
         ;;
     *)
         eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
         ;;
     esac
 }
 
 
 # Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
 func_cc_basename ()
 {
     for cc_temp in $*""; do
       case $cc_temp in
         compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
         distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
         \-*) ;;
         *) break;;
       esac
     done
     func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 }
 
 
 # ### END FUNCTIONS SHARED WITH CONFIGURE
 
 _LT_EOF
 
   case $host_os in
   aix3*)
     cat <<\_LT_EOF >> "$cfgfile"
 # AIX sometimes has problems with the GCC collect2 program.  For some
 # reason, if we set the COLLECT_NAMES environment variable, the problems
 # vanish in a puff of smoke.
 if test set != "${COLLECT_NAMES+set}"; then
   COLLECT_NAMES=
   export COLLECT_NAMES
 fi
 _LT_EOF
     ;;
   esac
 
 
 ltmain=$ac_aux_dir/ltmain.sh
 
 
   # We use sed instead of cat because bash on DJGPP gets confused if
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
   sed '$q' "$ltmain" >> "$cfgfile" \
      || (rm -f "$cfgfile"; exit 1)
 
    mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
  ;;
     "mkpkgng":F) chmod +x mkpkgng ;;
     "misc/coverage.sh":F) chmod +x misc/coverage.sh ;;
     "misc/coverity.sh":F) chmod +x misc/coverity.sh ;;
 
   esac
 done # for ac_tag
 
 
 as_fn_exit 0
 _ACEOF
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
   as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open
 # by configure, so config.status won't be able to write to it; its
 # output is simply discarded.  So we exec the FD to /dev/null,
 # effectively closing config.log, so it can be properly (re)opened and
 # appended to by config.status.  When coming back to configure, we
 # need to make the FD available again.
 if test "$no_create" != yes; then
   ac_cs_success=:
   ac_config_status_args=
   test "$silent" = yes &&
     ac_config_status_args="$ac_config_status_args --quiet"
   exec 5>/dev/null
   $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
Index: projects/clang800-import/contrib/openpam/configure.ac
===================================================================
--- projects/clang800-import/contrib/openpam/configure.ac	(revision 344548)
+++ projects/clang800-import/contrib/openpam/configure.ac	(revision 344549)
@@ -1,169 +1,151 @@
-dnl $OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des $
+dnl $OpenPAM: configure.ac 947 2019-02-24 20:18:17Z des $
 
 AC_PREREQ([2.62])
-AC_REVISION([$OpenPAM: configure.ac 939 2017-04-30 21:36:50Z des $])
-AC_INIT([OpenPAM], [20170430], [des@des.no], [openpam], [http://www.openpam.org/])
+AC_REVISION([$OpenPAM: configure.ac 947 2019-02-24 20:18:17Z des $])
+AC_INIT([OpenPAM], [20190224], [des@des.no], [openpam], [http://www.openpam.org/])
 AC_CONFIG_SRCDIR([lib/libpam/pam_start.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
 AM_CONFIG_HEADER([config.h])
 
 # C compiler and features
 AC_LANG(C)
 AC_PROG_CC
 AC_PROG_CC_STDC
 AC_PROG_CPP
 AC_GNU_SOURCE
 AC_C_CONST
 AC_C_RESTRICT
 AC_C_VOLATILE
 
 # libtool
 LT_PREREQ([2.2.6])
 LT_INIT([disable-static dlopen])
 
+# pkg-config
+AX_PROG_PKG_CONFIG
+
 # other programs
 AC_PROG_INSTALL
 
 LIB_MAJ=2
 AC_SUBST(LIB_MAJ)
 AC_DEFINE_UNQUOTED(LIB_MAJ, $LIB_MAJ, [OpenPAM library major number])
 
 AC_ARG_ENABLE([debug],
     AC_HELP_STRING([--enable-debug],
 	[turn debugging macros on]),
     AC_DEFINE(OPENPAM_DEBUG, 1, [Turn debugging macros on]))
 
 AC_ARG_ENABLE([unversioned-modules],
     AC_HELP_STRING([--disable-unversioned-modules],
 	[support loading of unversioned modules]),
     [AS_IF([test x"$enableval" = x"no"], [
 	AC_DEFINE(DISABLE_UNVERSIONED_MODULES,
 	    1,
 	    [Whether loading unversioned modules support is disabled])
     ])])
 
 AC_ARG_WITH([modules-dir],
     AC_HELP_STRING([--with-modules-dir=DIR],
 	[OpenPAM modules directory]),
     [AS_IF([test x"$withval" != x"no"], [
 	OPENPAM_MODULES_DIR="$withval"
 	AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR, 
 	    "${OPENPAM_MODULES_DIR%/}",
 	    [OpenPAM modules directory])
     ])])
 AC_SUBST(OPENPAM_MODULES_DIR)
 AM_CONDITIONAL([CUSTOM_MODULES_DIR], [test x"$OPENPAM_MODULES_DIR" != x""])
 
 AC_ARG_WITH([doc],
     AC_HELP_STRING([--without-doc], [do not build documentation]),
     [],
     [with_doc=yes])
 AM_CONDITIONAL([WITH_DOC], [test x"$with_doc" = x"yes"])
 
 AC_ARG_WITH([pam-unix],
     AC_HELP_STRING([--with-pam-unix], [build sample pam_unix(8) module]),
     [],
     [with_pam_unix=no])
 AM_CONDITIONAL([WITH_PAM_UNIX], [test x"$with_pam_unix" = x"yes"])
 
 AC_ARG_WITH(pamtest,
     AC_HELP_STRING([--with-pamtest], [build test application]),
     [],
     [with_pamtest=no])
 AM_CONDITIONAL([WITH_PAMTEST], [test x"$with_pamtest" = x"yes"])
 
 AC_ARG_WITH(su,
     AC_HELP_STRING([--with-su], [build sample su(1) implementation]),
     [],
     [with_su=no])
 AM_CONDITIONAL([WITH_SU], [test x"$with_su" = x"yes"])
 
 AC_ARG_WITH(system-libpam,
     AC_HELP_STRING([--with-system-libpam], [use system libpam]),
     [],
     [with_system_libpam=no])
 AM_CONDITIONAL([WITH_SYSTEM_LIBPAM], [test x"$with_system_libpam" = x"yes"])
 
 AC_CHECK_HEADERS([crypt.h])
 
 AC_CHECK_FUNCS([asprintf vasprintf])
 AC_CHECK_FUNCS([dlfunc fdlopen])
 AC_CHECK_FUNCS([fpurge])
 AC_CHECK_FUNCS([setlogmask])
 AC_CHECK_FUNCS([strlcat strlcmp strlcpy strlset])
 
 saved_LIBS="${LIBS}"
 LIBS=""
 AC_CHECK_LIB([dl], [dlopen])
 DL_LIBS="${LIBS}"
 LIBS="${saved_LIBS}"
 AC_SUBST(DL_LIBS)
 
 saved_LIBS="${LIBS}"
 LIBS=""
-AC_CHECK_LIB([crypt], [crypt])
-CRYPT_LIBS="${LIBS}"
-LIBS="${saved_LIBS}"
-AC_SUBST(CRYPT_LIBS)
-
-saved_LIBS="${LIBS}"
-LIBS=""
-AC_CHECK_LIB([crypto], [HMAC_CTX_init])
-CRYPTO_LIBS="${LIBS}"
-LIBS="${saved_LIBS}"
-AC_SUBST(CRYPTO_LIBS)
-
-saved_LIBS="${LIBS}"
-LIBS=""
 AC_CHECK_LIB([pam], [pam_start])
 SYSTEM_LIBPAM="${LIBS}"
 LIBS="${saved_LIBS}"
 AC_SUBST(SYSTEM_LIBPAM)
 
-save_LIBS="${LIBS}"
-LIBS=""
-AC_SEARCH_LIBS([cryb_test_version], [cryb-test], [
-  CRYB_TEST_LIBS="${LIBS}"
-], [
-  CRYB_TEST_LIBS=""
-  AC_MSG_WARN([cryb-test library not available, unit tests disabled])
-])
-LIBS="${save_LIBS}"
-AC_SUBST(CRYB_TEST_LIBS)
-AM_CONDITIONAL([WITH_TEST], [ test x"$CRYB_TEST_LIBS" != x"" ])
+AX_PKG_CONFIG_CHECK([cryb-test],
+  [AC_MSG_NOTICE([Cryb test framework found, unit tests enabled.])],
+  [AC_MSG_WARN([Cryb test framework not found, unit tests disabled.])])
+AM_CONDITIONAL([WITH_TEST], [test x"$CRYB_TEST_LIBS" != x""])
 
 AC_ARG_ENABLE([developer-warnings],
     AS_HELP_STRING([--enable-developer-warnings], [enable strict warnings (default is NO)]),
     [CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual"])
 AC_ARG_ENABLE([debugging-symbols],
     AS_HELP_STRING([--enable-debugging-symbols], [enable debugging symbols (default is NO)]),
     [CFLAGS="${CFLAGS} -O0 -g -fno-inline"])
 AC_ARG_ENABLE([werror],
     AS_HELP_STRING([--enable-werror], [use -Werror (default is NO)]),
     [CFLAGS="${CFLAGS} -Werror"])
 
 AC_CONFIG_FILES([
     Makefile
     bin/Makefile
     bin/openpam_dump_policy/Makefile
     bin/pamtest/Makefile
     bin/su/Makefile
     doc/Makefile
     doc/man/Makefile
     include/Makefile
     include/security/Makefile
     lib/Makefile
     lib/libpam/Makefile
     misc/Makefile
     modules/Makefile
     modules/pam_deny/Makefile
     modules/pam_permit/Makefile
     modules/pam_return/Makefile
     modules/pam_unix/Makefile
     t/Makefile
 ])
 AC_CONFIG_FILES([mkpkgng],[chmod +x mkpkgng])
 AC_CONFIG_FILES([misc/coverage.sh],[chmod +x misc/coverage.sh])
 AC_CONFIG_FILES([misc/coverity.sh],[chmod +x misc/coverity.sh])
 AC_OUTPUT
Index: projects/clang800-import/contrib/openpam/depcomp
===================================================================
--- projects/clang800-import/contrib/openpam/depcomp	(revision 344548)
+++ projects/clang800-import/contrib/openpam/depcomp	(revision 344549)
@@ -1,791 +1,791 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
 # Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
 
 case $1 in
   '')
     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
     exit 1;
     ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
 
 Run PROGRAMS ARGS to compile a file, generating dependencies
 as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
   source      Source file read by 'PROGRAMS ARGS'.
   object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
   tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
     exit $?
     ;;
   -v | --v*)
     echo "depcomp $scriptversion"
     exit $?
     ;;
 esac
 
 # Get the directory component of the given path, and save it in the
 # global variables '$dir'.  Note that this directory component will
 # be either empty or ending with a '/' character.  This is deliberate.
 set_dir_from ()
 {
   case $1 in
     */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
       *) dir=;;
   esac
 }
 
 # Get the suffix-stripped basename of the given path, and save it the
 # global variable '$base'.
 set_base_from ()
 {
   base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
 }
 
 # If no dependency file was actually created by the compiler invocation,
 # we still have to create a dummy depfile, to avoid errors with the
 # Makefile "include basename.Plo" scheme.
 make_dummy_depfile ()
 {
   echo "#dummy" > "$depfile"
 }
 
 # Factor out some common post-processing of the generated depfile.
 # Requires the auxiliary global variable '$tmpdepfile' to be set.
 aix_post_process_depfile ()
 {
   # If the compiler actually managed to produce a dependency file,
   # post-process it.
   if test -f "$tmpdepfile"; then
     # Each line is of the form 'foo.o: dependency.h'.
     # Do two passes, one to just change these to
     #   $object: dependency.h
     # and one to simply output
     #   dependency.h:
     # which is needed to avoid the deleted-header problem.
     { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
       sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
     } > "$depfile"
     rm -f "$tmpdepfile"
   else
     make_dummy_depfile
   fi
 }
 
 # A tabulation character.
 tab='	'
 # A newline character.
 nl='
 '
 # Character ranges might be problematic outside the C locale.
 # These definitions help.
 upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
 lower=abcdefghijklmnopqrstuvwxyz
 digits=0123456789
 alpha=${upper}${lower}
 
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
 fi
 
 # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
 depfile=${depfile-`echo "$object" |
   sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
 # Avoid interferences from the environment.
 gccflag= dashmflag=
 
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
 # here, because this file can only contain one case statement.
 if test "$depmode" = hp; then
   # HP compiler uses -M and no extra arg.
   gccflag=-M
   depmode=gcc
 fi
 
 if test "$depmode" = dashXmstdout; then
   # This is just like dashmstdout with a different argument.
   dashmflag=-xM
   depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
   # This is just like msvisualcpp but w/o cygpath translation.
   # Just convert the backslash-escaped backslashes to single forward
   # slashes to satisfy depend.m4
   cygpath_u='sed s,\\\\,/,g'
   depmode=msvisualcpp
 fi
 
 if test "$depmode" = msvc7msys; then
   # This is just like msvc7 but w/o cygpath translation.
   # Just convert the backslash-escaped backslashes to single forward
   # slashes to satisfy depend.m4
   cygpath_u='sed s,\\\\,/,g'
   depmode=msvc7
 fi
 
 if test "$depmode" = xlc; then
   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
   gccflag=-qmakedep=gcc,-MF
   depmode=gcc
 fi
 
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
 ## Unfortunately, FreeBSD c89 acceptance of flags depends upon
 ## the command line argument order; so add the flags where they
 ## appear in depend2.am.  Note that the slowdown incurred here
 ## affects only configure: in makefiles, %FASTDEP% shortcuts this.
   for arg
   do
     case $arg in
     -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
     *)  set fnord "$@" "$arg" ;;
     esac
     shift # fnord
     shift # $arg
   done
   "$@"
   stat=$?
   if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   mv "$tmpdepfile" "$depfile"
   ;;
 
 gcc)
 ## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
 ## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
 ## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
 ##   -MM, not -M (despite what the docs say).  Also, it might not be
 ##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
     gccflag=-MD,
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
   if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   # The second -e expression handles DOS-style file names with drive
   # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
 ## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
 ## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.  hp depmode also adds that space, but also prefixes the VPATH
 ## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
   tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
     | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
 hp)
   # This case exists only to let depend.m4 do its work.  It works by
   # looking at the text of this script.  This case will never be run,
   # since it is checked for above.
   exit 1
   ;;
 
 sgi)
   if test "$libtool" = yes; then
     "$@" "-Wp,-MDupdate,$tmpdepfile"
   else
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
   if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
     # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
     tr ' ' "$nl" < "$tmpdepfile" \
       | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
       | tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
     # The second pass generates a dummy entry for each header file.
     tr ' ' "$nl" < "$tmpdepfile" \
       | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
       >> "$depfile"
   else
     make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
 
 xlc)
   # This case exists only to let depend.m4 do its work.  It works by
   # looking at the text of this script.  This case will never be run,
   # since it is checked for above.
   exit 1
   ;;
 
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
   # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   set_dir_from "$object"
   set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
     tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$dir$base.u
     tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
   if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
   do
     test -f "$tmpdepfile" && break
   done
   aix_post_process_depfile
   ;;
 
 tcc)
   # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
   # FIXME: That version still under development at the moment of writing.
   #        Make that this statement remains true also for stable, released
   #        versions.
   # It will wrap lines (doesn't matter whether long or short) with a
   # trailing '\', as in:
   #
   #   foo.o : \
   #    foo.c \
   #    foo.h \
   #
   # It will put a trailing '\' even on the last line, and will use leading
   # spaces rather than leading tabs (at least since its commit 0394caf7
   # "Emit spaces for -MD").
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
   # We have to change lines of the first kind to '$object: \'.
   sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
   # And for each line of the second kind, we have to emit a 'dep.h:'
   # dummy dependency, to avoid the deleted-header problem.
   sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
 ## The order of this option in the case statement is important, since the
 ## shell code in configure will try each of these formats in the order
 ## listed in this file.  A plain '-MD' option would be understood by many
 ## compilers, so we must ensure this comes after the gcc and icc options.
 pgcc)
   # Portland's C compiler understands '-MD'.
   # Will always output deps to 'file.d' where file is the root name of the
   # source file under compilation, even if file resides in a subdirectory.
   # The object file name does not affect the name of the '.d' file.
   # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
   # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
   set_dir_from "$object"
   # Use the source, not the object, to determine the base name, since
   # that's sadly what pgcc will do too.
   set_base_from "$source"
   tmpdepfile=$base.d
 
   # For projects that build the same source file twice into different object
   # files, the pgcc approach of using the *source* file root name can cause
   # problems in parallel builds.  Use a locking strategy to avoid stomping on
   # the same $tmpdepfile.
   lockdir=$base.d-lock
   trap "
     echo '$0: caught signal, cleaning up...' >&2
     rmdir '$lockdir'
     exit 1
   " 1 2 13 15
   numtries=100
   i=$numtries
   while test $i -gt 0; do
     # mkdir is a portable test-and-set.
     if mkdir "$lockdir" 2>/dev/null; then
       # This process acquired the lock.
       "$@" -MD
       stat=$?
       # Release the lock.
       rmdir "$lockdir"
       break
     else
       # If the lock is being held by a different process, wait
       # until the winning process is done or we timeout.
       while test -d "$lockdir" && test $i -gt 0; do
         sleep 1
         i=`expr $i - 1`
       done
     fi
     i=`expr $i - 1`
   done
   trap - 1 2 13 15
   if test $i -le 0; then
     echo "$0: failed to acquire lock after $numtries attempts" >&2
     echo "$0: check lockdir '$lockdir'" >&2
     exit 1
   fi
 
   if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   # Each line is of the form `foo.o: dependent.h',
   # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
   # Do two passes, one to just change these to
   # `$object: dependent.h' and one to simply `dependent.h:'.
   sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
   sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
     | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
 hp2)
   # The "hp" stanza above does not work with aCC (C++) and HP's ia64
   # compilers, which have integrated preprocessors.  The correct option
   # to use with these is +Maked; it writes dependencies to a file named
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
   set_dir_from  "$object"
   set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
     "$@" -Wc,+Maked
   else
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir$base.d
     "$@" +Maked
   fi
   stat=$?
   if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
 
   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
   do
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add 'dependent.h:' lines.
     sed -ne '2,${
                s/^ *//
                s/ \\*$//
                s/$/:/
                p
              }' "$tmpdepfile" >> "$depfile"
   else
     make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
   # The Tru64 compiler uses -MD to generate dependencies as a side
   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
   # dependencies in 'foo.d' instead, so we check for that too.
   # Subdirectories are respected.
   set_dir_from  "$object"
   set_base_from "$object"
 
   if test "$libtool" = yes; then
     # Libtool generates 2 separate objects for the 2 libraries.  These
     # two compilations output dependencies in $dir.libs/$base.o.d and
     # in $dir$base.o.d.  We have to check for both files, because
     # one of the two compilations can be disabled.  We should prefer
     # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
     # automatically cleaned when .libs/ is deleted, while ignoring
     # the former would cause a distcleancheck panic.
     tmpdepfile1=$dir$base.o.d          # libtool 1.5
     tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
     tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
     "$@" -Wc,-MD
   else
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir$base.d
     tmpdepfile3=$dir$base.d
     "$@" -MD
   fi
 
   stat=$?
   if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
   do
     test -f "$tmpdepfile" && break
   done
   # Same post-processing that is required for AIX mode.
   aix_post_process_depfile
   ;;
 
 msvc7)
   if test "$libtool" = yes; then
     showIncludes=-Wc,-showIncludes
   else
     showIncludes=-showIncludes
   fi
   "$@" $showIncludes > "$tmpdepfile"
   stat=$?
   grep -v '^Note: including file: ' "$tmpdepfile"
   if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   # The first sed program below extracts the file names and escapes
   # backslashes for cygpath.  The second sed program outputs the file
   # name when reading, but also accumulates all include files in the
   # hold buffer in order to output them again at the end.  This only
   # works with sed implementations that can handle large buffers.
   sed < "$tmpdepfile" -n '
 /^Note: including file:  *\(.*\)/ {
   s//\1/
   s/\\/\\\\/g
   p
 }' | $cygpath_u | sort -u | sed -n '
 s/ /\\ /g
 s/\(.*\)/'"$tab"'\1 \\/p
 s/.\(.*\) \\/\1:/
 H
 $ {
   s/.*/'"$tab"'/
   G
   p
 }' >> "$depfile"
   echo >> "$depfile" # make sure the fragment doesn't end with a backslash
   rm -f "$tmpdepfile"
   ;;
 
 msvc7msys)
   # This case exists only to let depend.m4 do its work.  It works by
   # looking at the text of this script.  This case will never be run,
   # since it is checked for above.
   exit 1
   ;;
 
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
 
 dashmstdout)
   # Important note: in order to support this mode, a compiler *must*
   # always write the preprocessed file to stdout, regardless of -o.
   "$@" || exit $?
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
     while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
   # Remove '-o $object'.
   IFS=" "
   for arg
   do
     case $arg in
     -o)
       shift
       ;;
     $object)
       shift
       ;;
     *)
       set fnord "$@" "$arg"
       shift # fnord
       shift # $arg
       ;;
     esac
   done
 
   test -z "$dashmflag" && dashmflag=-M
   # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
   # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
     sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this sed invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
   tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
     | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
 dashXmstdout)
   # This case only exists to satisfy depend.m4.  It is never actually
   # run, as this mode is specially recognized in the preamble.
   exit 1
   ;;
 
 makedepend)
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
     while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
   cleared=no eat=no
   for arg
   do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
     if test $eat = yes; then
       eat=no
       continue
     fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
     -arch)
       eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
   obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
   # makedepend may prepend the VPATH from the source file name to the object.
   # No need to regex-escape $object, excess matching of '.' is harmless.
   sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process the last invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
   sed '1,2d' "$tmpdepfile" \
     | tr ' ' "$nl" \
     | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
     | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
 cpp)
   # Important note: in order to support this mode, a compiler *must*
   # always write the preprocessed file to stdout.
   "$@" || exit $?
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
     while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
   # Remove '-o $object'.
   IFS=" "
   for arg
   do
     case $arg in
     -o)
       shift
       ;;
     $object)
       shift
       ;;
     *)
       set fnord "$@" "$arg"
       shift # fnord
       shift # $arg
       ;;
     esac
   done
 
   "$@" -E \
     | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
              -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
     | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
   sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
   # always write the preprocessed file to stdout.
   "$@" || exit $?
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
     while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
   IFS=" "
   for arg
   do
     case "$arg" in
     -o)
       shift
       ;;
     $object)
       shift
       ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
         set fnord "$@"
         shift
         shift
         ;;
     *)
         set fnord "$@" "$arg"
         shift
         shift
         ;;
     esac
   done
   "$@" -E 2>/dev/null |
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
   echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
 msvcmsys)
   # This case exists only to let depend.m4 do its work.  It works by
   # looking at the text of this script.  This case will never be run,
   # since it is checked for above.
   exit 1
   ;;
 
 none)
   exec "$@"
   ;;
 
 *)
   echo "Unknown depmode $depmode" 1>&2
   exit 1
   ;;
 esac
 
 exit 0
 
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
Index: projects/clang800-import/contrib/openpam/doc/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/doc/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/Makefile.in	(revision 344549)
@@ -1,624 +1,631 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
 	install-exec-recursive install-html-recursive \
 	install-info-recursive install-pdf-recursive \
 	install-ps-recursive install-recursive installcheck-recursive \
 	installdirs-recursive pdf-recursive ps-recursive \
 	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
   $(RECURSIVE_TARGETS) \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
   sed_rest='s,^[^/]*/*,,'; \
   sed_last='s,^.*/\([^/]*\)$$,\1,'; \
   sed_butlast='s,/*[^/]*$$,,'; \
   while test -n "$$dir1"; do \
     first=`echo "$$dir1" | sed -e "$$sed_first"`; \
     if test "$$first" != "."; then \
       if test "$$first" = ".."; then \
         dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
         dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
       else \
         first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
         if test "$$first2" = "$$first"; then \
           dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
         else \
           dir2="../$$dir2"; \
         fi; \
         dir0="$$dir0"/"$$first"; \
       fi; \
     fi; \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = man
 all: all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign doc/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
 	@fail=; \
 	if $(am__make_keepgoing); then \
 	  failcom='fail=yes'; \
 	else \
 	  failcom='exit 1'; \
 	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
 	    local_target="$$target-am"; \
 	  else \
 	    local_target="$$target"; \
 	  fi; \
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-recursive
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
 	  empty_fix=.; \
 	else \
 	  include_option=--include; \
 	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-recursive
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    $(am__make_dryrun) \
 	      || test -d "$(distdir)/$$subdir" \
 	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
 	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
 	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
 	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-recursive
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
 html: html-recursive
 
 html-am:
 
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-recursive
 
 install-html-am:
 
 install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
 install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
 
 pdf-am:
 
 ps: ps-recursive
 
 ps-am:
 
 uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic clean-libtool cscopelist-am ctags \
 	ctags-am distclean distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/doc/man/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/Makefile.in	(revision 344549)
@@ -1,651 +1,658 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc/man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 man3dir = $(mandir)/man3
 am__installdirs = "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)"
 man5dir = $(mandir)/man5
 NROFF = nroff
 MANS = $(dist_man3_MANS) $(dist_man5_MANS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(dist_man3_MANS) $(dist_man5_MANS) \
 	$(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 VPATH = $(LIBPAMSRCDIR) $(srcdir)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
 
 # Standard PAM API
 PAM_MAN = \
 	pam_acct_mgmt.3 \
 	pam_authenticate.3 \
 	pam_chauthtok.3 \
 	pam_close_session.3 \
 	pam_end.3 \
 	pam_get_data.3 \
 	pam_get_item.3 \
 	pam_get_user.3 \
 	pam_getenv.3 \
 	pam_getenvlist.3 \
 	pam_open_session.3 \
 	pam_putenv.3 \
 	pam_set_data.3 \
 	pam_set_item.3 \
 	pam_setcred.3 \
 	pam_start.3 \
 	pam_strerror.3 \
 	$(NULL)
 
 
 # Standard module API
 MOD_MAN = \
 	pam_sm_acct_mgmt.3 \
 	pam_sm_authenticate.3 \
 	pam_sm_chauthtok.3 \
 	pam_sm_close_session.3 \
 	pam_sm_open_session.3 \
 	pam_sm_setcred.3 \
 	$(NULL)
 
 
 # OpenPAM extensions
 OPENPAM_MAN = \
 	openpam_borrow_cred.3 \
 	openpam_free_data.3 \
 	openpam_free_envlist.3 \
 	openpam_get_feature.3 \
 	openpam_get_option.3 \
 	openpam_log.3 \
 	openpam_nullconv.3 \
 	openpam_readline.3 \
 	openpam_readlinev.3 \
 	openpam_readword.3 \
 	openpam_restore_cred.3 \
 	openpam_set_feature.3 \
 	openpam_set_option.3 \
 	openpam_straddch.3 \
 	openpam_subst.3 \
 	openpam_ttyconv.3 \
 	pam_error.3 \
 	pam_get_authtok.3 \
 	pam_info.3 \
 	pam_prompt.3 \
 	pam_setenv.3 \
 	pam_verror.3 \
 	pam_vinfo.3 \
 	pam_vprompt.3 \
 	$(NULL)
 
 EXTRA_DIST = openpam.man pam.man
 @WITH_SYSTEM_LIBPAM_FALSE@PAMCMAN = $(PAM_MAN) $(MOD_MAN) $(OPENPAM_MAN)
 @WITH_SYSTEM_LIBPAM_FALSE@PAMXMAN = openpam.3 pam.3
 ALLCMAN = $(PAMCMAN)
 GENMAN = $(ALLCMAN) $(PAMXMAN)
 dist_man3_MANS = $(GENMAN) pam_conv.3
 dist_man5_MANS = pam.conf.5
 CLEANFILES = $(GENMAN)
 GENDOC = $(top_srcdir)/misc/gendoc.pl
 LIBPAMSRCDIR = $(top_srcdir)/lib/libpam
 SUFFIXES = .3
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .3 .c
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/man/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign doc/man/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 install-man3: $(dist_man3_MANS)
 	@$(NORMAL_INSTALL)
 	@list1='$(dist_man3_MANS)'; \
 	list2=''; \
 	test -n "$(man3dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
 	echo " $(MKDIR_P) '$(DESTDIR)$(man3dir)'"; \
 	$(MKDIR_P) "$(DESTDIR)$(man3dir)" || exit 1; \
 	{ for i in $$list1; do echo "$$i"; done;  \
 	if test -n "$$list2"; then \
 	  for i in $$list2; do echo "$$i"; done \
 	    | sed -n '/\.3[a-z]*$$/p'; \
 	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
 	done | \
 	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
 	sed 'N;N;s,\n, ,g' | { \
 	list=; while read file base inst; do \
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
 	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
 	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
 	  fi; \
 	done; \
 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 	while read files; do \
 	  test -z "$$files" || { \
 	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \
 	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \
 	done; }
 
 uninstall-man3:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_man3_MANS)'; test -n "$(man3dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
 install-man5: $(dist_man5_MANS)
 	@$(NORMAL_INSTALL)
 	@list1='$(dist_man5_MANS)'; \
 	list2=''; \
 	test -n "$(man5dir)" \
 	  && test -n "`echo $$list1$$list2`" \
 	  || exit 0; \
 	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
 	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
 	{ for i in $$list1; do echo "$$i"; done;  \
 	if test -n "$$list2"; then \
 	  for i in $$list2; do echo "$$i"; done \
 	    | sed -n '/\.5[a-z]*$$/p'; \
 	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
 	done | \
 	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
 	sed 'N;N;s,\n, ,g' | { \
 	list=; while read file base inst; do \
 	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
 	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
 	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
 	  fi; \
 	done; \
 	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
 	while read files; do \
 	  test -z "$$files" || { \
 	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
 	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
 	done; }
 
 uninstall-man5:
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_man5_MANS)'; test -n "$(man5dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
 	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
 
 ctags CTAGS:
 
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(MANS)
 installdirs:
 	for dir in "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man5dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am: install-man
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man: install-man3 install-man5
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-man
 
 uninstall-man: uninstall-man3 uninstall-man5
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-man3 install-man5 install-pdf install-pdf-am \
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
 	uninstall-am uninstall-man uninstall-man3 uninstall-man5
 
 .PRECIOUS: Makefile
 
 
 .c.3: $(GENDOC)
 	perl -w $(GENDOC) $< || rm $@
 
 openpam.3: $(OPENPAM_MAN) $(GENDOC) $(srcdir)/openpam.man
 	perl -w $(GENDOC) -o $(OPENPAM_MAN) <$(srcdir)/openpam.man || rm $@
 
 pam.3: $(PAM_MAN) $(GENDOC) $(srcdir)/pam.man
 	perl -w $(GENDOC) -p $(PAM_MAN) <$(srcdir)/pam.man || rm $@
 
 $(GENMAN): $(GENDOC)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/doc/man/openpam.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam.3	(revision 344549)
@@ -1,136 +1,136 @@
 .\" Generated by gendoc.pl
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM 3
 .Os
 .Sh NAME
 .Nm openpam_borrow_cred ,
 .Nm openpam_free_data ,
 .Nm openpam_free_envlist ,
 .Nm openpam_get_feature ,
 .Nm openpam_get_option ,
 .Nm openpam_log ,
 .Nm openpam_nullconv ,
 .Nm openpam_readline ,
 .Nm openpam_readlinev ,
 .Nm openpam_readword ,
 .Nm openpam_restore_cred ,
 .Nm openpam_set_feature ,
 .Nm openpam_set_option ,
 .Nm openpam_straddch ,
 .Nm openpam_subst ,
 .Nm openpam_ttyconv ,
 .Nm pam_error ,
 .Nm pam_get_authtok ,
 .Nm pam_info ,
 .Nm pam_prompt ,
 .Nm pam_setenv ,
 .Nm pam_verror ,
 .Nm pam_vinfo ,
 .Nm pam_vprompt
 .Nd Pluggable Authentication Modules Library
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd"
 .Ft "void"
 .Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status"
 .Ft "void"
 .Fn openpam_free_envlist "char **envlist"
 .Ft "int"
 .Fn openpam_get_feature "int feature" "int *onoff"
 .Ft "const char *"
 .Fn openpam_get_option "pam_handle_t *pamh" "const char *option"
 .Ft "void"
 .Fn openpam_log "int level" "const char *fmt" "..."
 .Ft "int"
 .Fn openpam_nullconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data"
 .Ft "char *"
 .Fn openpam_readline "FILE *f" "int *lineno" "size_t *lenp"
 .Ft "char **"
 .Fn openpam_readlinev "FILE *f" "int *lineno" "int *lenp"
 .Ft "char *"
 .Fn openpam_readword "FILE *f" "int *lineno" "size_t *lenp"
 .Ft "int"
 .Fn openpam_restore_cred "pam_handle_t *pamh"
 .Ft "int"
 .Fn openpam_set_feature "int feature" "int onoff"
 .Ft "int"
 .Fn openpam_set_option "pam_handle_t *pamh" "const char *option" "const char *value"
 .Ft "int"
 .Fn openpam_straddch "char **str" "size_t *size" "size_t *len" "int ch"
 .Ft "int"
 .Fn openpam_subst "const pam_handle_t *pamh" "char *buf" "size_t *bufsize" "const char *template"
 .Ft "int"
 .Fn openpam_ttyconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data"
 .Ft "int"
 .Fn pam_error "const pam_handle_t *pamh" "const char *fmt" "..."
 .Ft "int"
 .Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt"
 .Ft "int"
 .Fn pam_info "const pam_handle_t *pamh" "const char *fmt" "..."
 .Ft "int"
 .Fn pam_prompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "..."
 .Ft "int"
 .Fn pam_setenv "pam_handle_t *pamh" "const char *name" "const char *value" "int overwrite"
 .Ft "int"
 .Fn pam_verror "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
 .Ft "int"
 .Fn pam_vinfo "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
 .Ft "int"
 .Fn pam_vprompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap"
 .\"
 .\" $OpenPAM: openpam.man 938 2017-04-30 21:34:42Z des $
 .\"
 .Sh DESCRIPTION
 These functions are OpenPAM extensions to the PAM API.
 Those named
 .Fn pam_*
 are, in the author's opinion, logical and necessary extensions to the
 standard API, while those named
 .Fn openpam_*
 are either simple convenience functions, or functions intimately tied
 to OpenPAM implementation details, and therefore not well suited to
 standardization.
 .Sh SEE ALSO
 .Xr openpam_borrow_cred 3 ,
 .Xr openpam_free_data 3 ,
 .Xr openpam_free_envlist 3 ,
 .Xr openpam_get_feature 3 ,
 .Xr openpam_get_option 3 ,
 .Xr openpam_log 3 ,
 .Xr openpam_nullconv 3 ,
 .Xr openpam_readline 3 ,
 .Xr openpam_readlinev 3 ,
 .Xr openpam_readword 3 ,
 .Xr openpam_restore_cred 3 ,
 .Xr openpam_set_feature 3 ,
 .Xr openpam_set_option 3 ,
 .Xr openpam_straddch 3 ,
 .Xr openpam_subst 3 ,
 .Xr openpam_ttyconv 3 ,
 .Xr pam_error 3 ,
 .Xr pam_get_authtok 3 ,
 .Xr pam_info 3 ,
 .Xr pam_prompt 3 ,
 .Xr pam_setenv 3 ,
 .Xr pam_verror 3 ,
 .Xr pam_vinfo 3 ,
 .Xr pam_vprompt 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The OpenPAM library and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_borrow_cred.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_borrow_cred.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_borrow_cred.3	(revision 344549)
@@ -1,65 +1,65 @@
 .\" Generated from openpam_borrow_cred.c by gendoc.pl
 .\" $OpenPAM: openpam_borrow_cred.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_BORROW_CRED 3
 .Os
 .Sh NAME
 .Nm openpam_borrow_cred
 .Nd temporarily borrow user credentials
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_borrow_cred "pam_handle_t *pamh" "const struct passwd *pwd"
 .Sh DESCRIPTION
 The
 .Fn openpam_borrow_cred
 function saves the current credentials and
 switches to those of the user specified by its
 .Fa pwd
 argument.
 The affected credentials are the effective UID, the effective GID, and
 the group access list.
 The original credentials can be restored using
 .Xr openpam_restore_cred 3 .
 .Pp
 .Sh RETURN VALUES
 The
 .Fn openpam_borrow_cred
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr setegid 2 ,
 .Xr seteuid 2 ,
 .Xr setgroups 2 ,
 .Xr openpam_restore_cred 3 ,
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 The
 .Fn openpam_borrow_cred
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_borrow_cred
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_free_data.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_free_data.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_free_data.3	(revision 344549)
@@ -1,46 +1,46 @@
 .\" Generated from openpam_free_data.c by gendoc.pl
 .\" $OpenPAM: openpam_free_data.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_FREE_DATA 3
 .Os
 .Sh NAME
 .Nm openpam_free_data
 .Nd generic cleanup function
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "void"
 .Fn openpam_free_data "pam_handle_t *pamh" "void *data" "int status"
 .Sh DESCRIPTION
 The
 .Fn openpam_free_data
 function is a cleanup function suitable for
 passing to
 .Xr pam_set_data 3 .
 It simply releases the data by passing its
 .Fa data
 argument to
 .Xr free 3 .
 .Sh SEE ALSO
 .Xr free 3 ,
 .Xr pam 3 ,
 .Xr pam_set_data 3
 .Sh STANDARDS
 The
 .Fn openpam_free_data
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_free_data
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_free_envlist.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_free_envlist.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_free_envlist.3	(revision 344549)
@@ -1,36 +1,36 @@
 .\" Generated from openpam_free_envlist.c by gendoc.pl
 .\" $OpenPAM: openpam_free_envlist.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_FREE_ENVLIST 3
 .Os
 .Sh NAME
 .Nm openpam_free_envlist
 .Nd free an environment list
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "void"
 .Fn openpam_free_envlist "char **envlist"
 .Sh DESCRIPTION
 The
 .Fn openpam_free_envlist
 function is a convenience function which
 frees all the environment variables in an environment list, and the
 list itself.
 It is suitable for freeing the return value from
 .Xr pam_getenvlist 3 .
 .Pp
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_getenvlist 3
 .Sh STANDARDS
 The
 .Fn openpam_free_envlist
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_free_envlist
 function and this manual page were
 developed by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_get_feature.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_get_feature.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_get_feature.3	(revision 344549)
@@ -1,71 +1,71 @@
 .\" Generated from openpam_get_feature.c by gendoc.pl
 .\" $OpenPAM: openpam_get_feature.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_GET_FEATURE 3
 .Os
 .Sh NAME
 .Nm openpam_get_feature
 .Nd query the state of an optional feature
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_get_feature "int feature" "int *onoff"
 .Sh DESCRIPTION
 .Bf Sy
 This function is experimental and may be modified or removed in a future release without prior warning.
 .Ef
 .Pp
 The
 .Fn openpam_get_feature
 function stores the current state of the
 specified feature in the variable pointed to by its
 .Fa onoff
 argument.
 .Pp
 The following features are recognized:
 .Bl -tag -width 18n
 .It Dv OPENPAM_RESTRICT_SERVICE_NAME
 Disallow path separators in service names.
 This feature is enabled by default.
 Disabling it allows the application to specify the path to
 the desired policy file directly.
 .It Dv OPENPAM_VERIFY_POLICY_FILE
 Verify the ownership and permissions of the policy file
 and the path leading up to it.
 This feature is enabled by default.
 .It Dv OPENPAM_RESTRICT_MODULE_NAME
 Disallow path separators in module names.
 This feature is disabled by default.
 Enabling it prevents the use of modules in non-standard
 locations.
 .It Dv OPENPAM_VERIFY_MODULE_FILE
 Verify the ownership and permissions of each loadable
 module and the path leading up to it.
 This feature is enabled by default.
 .El
 .Sh RETURN VALUES
 The
 .Fn openpam_get_feature
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BAD_FEATURE
 Unrecognized or restricted feature.
 .El
 .Sh SEE ALSO
 .Xr openpam_set_feature 3 ,
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 The
 .Fn openpam_get_feature
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_get_feature
 function and this manual page were
 developed by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_get_option.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_get_option.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_get_option.3	(revision 344549)
@@ -1,49 +1,49 @@
 .\" Generated from openpam_get_option.c by gendoc.pl
 .\" $OpenPAM: openpam_get_option.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_GET_OPTION 3
 .Os
 .Sh NAME
 .Nm openpam_get_option
 .Nd returns the value of a module option
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "const char *"
 .Fn openpam_get_option "pam_handle_t *pamh" "const char *option"
 .Sh DESCRIPTION
 The
 .Fn openpam_get_option
 function returns the value of the specified
 option in the context of the currently executing service module, or
 .Dv NULL
 if the option is not set or no module is currently executing.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn openpam_get_option
 function returns
 .Dv NULL
 on failure.
 .Sh SEE ALSO
 .Xr openpam_set_option 3 ,
 .Xr pam 3
 .Sh STANDARDS
 The
 .Fn openpam_get_option
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_get_option
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_log.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_log.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_log.3	(revision 344549)
@@ -1,91 +1,91 @@
 .\" Generated from openpam_log.c by gendoc.pl
 .\" $OpenPAM: openpam_log.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_LOG 3
 .Os
 .Sh NAME
 .Nm openpam_log
 .Nd log a message through syslog
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "void"
 .Fn openpam_log "int level" "const char *fmt" "..."
 .Sh DESCRIPTION
 The
 .Fn openpam_log
 function logs messages using
 .Xr syslog 3 .
 It is primarily intended for internal use by the library and modules.
 .Pp
 The
 .Fa level
 argument indicates the importance of the message.
 The following levels are defined:
 .Bl -tag -width 18n
 .It Dv PAM_LOG_LIBDEBUG
 Debugging messages.
 For internal use only.
 .It Dv PAM_LOG_DEBUG
 Debugging messages.
 These messages are normally not logged unless the global
 integer variable
 .Va openpam_debug
 is set to a non-zero
 value, in which case they are logged with a
 .Xr syslog 3
 priority of
 .Dv LOG_DEBUG .
 .It Dv PAM_LOG_VERBOSE
 Information about the progress of the authentication
 process, or other non-essential messages.
 These messages are logged with a
 .Xr syslog 3
 priority of
 .Dv LOG_INFO .
 .It Dv PAM_LOG_NOTICE
 Messages relating to non-fatal errors.
 These messages are logged with a
 .Xr syslog 3
 priority of
 .Dv LOG_NOTICE .
 .It Dv PAM_LOG_ERROR
 Messages relating to serious errors.
 These messages are logged with a
 .Xr syslog 3
 priority of
 .Dv LOG_ERR .
 .El
 .Pp
 The remaining arguments are a
 .Xr printf 3
 format string and the
 corresponding arguments.
 .Pp
 The
 .Fn openpam_log
 function does not modify the value of
 .Va errno .
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr printf 3 ,
 .Xr syslog 3
 .Sh STANDARDS
 The
 .Fn openpam_log
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_log
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_nullconv.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_nullconv.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_nullconv.3	(revision 344549)
@@ -1,72 +1,72 @@
 .\" Generated from openpam_nullconv.c by gendoc.pl
 .\" $OpenPAM: openpam_nullconv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_NULLCONV 3
 .Os
 .Sh NAME
 .Nm openpam_nullconv
 .Nd null conversation function
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_nullconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data"
 .Sh DESCRIPTION
 The
 .Fn openpam_nullconv
 function is a null conversation function suitable
 for applications that want to use PAM but don't support interactive
 dialog with the user.
 Such applications should set
 .Dv PAM_AUTHTOK
 to whatever authentication
 token they've obtained on their own before calling
 .Xr pam_authenticate 3
 and / or
 .Xr pam_chauthtok 3 ,
 and their PAM configuration should specify the
 .Dv use_first_pass
 option for all modules that require access to the
 authentication token, to make sure they use
 .Dv PAM_AUTHTOK
 rather than
 try to query the user.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn openpam_nullconv
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .El
 .Sh SEE ALSO
 .Xr openpam_ttyconv 3 ,
 .Xr pam 3 ,
 .Xr pam_authenticate 3 ,
 .Xr pam_chauthtok 3 ,
 .Xr pam_prompt 3 ,
 .Xr pam_set_item 3 ,
 .Xr pam_strerror 3 ,
 .Xr pam_vprompt 3
 .Sh STANDARDS
 The
 .Fn openpam_nullconv
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_nullconv
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_readline.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_readline.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_readline.3	(revision 344549)
@@ -1,89 +1,89 @@
 .\" Generated from openpam_readline.c by gendoc.pl
 .\" $OpenPAM: openpam_readline.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_READLINE 3
 .Os
 .Sh NAME
 .Nm openpam_readline
 .Nd read a line from a file
 .Sh SYNOPSIS
 .In sys/types.h
 .In stdio.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "char *"
 .Fn openpam_readline "FILE *f" "int *lineno" "size_t *lenp"
 .Sh DESCRIPTION
 .Bf Sy
 This function is deprecated and may be removed in a future release without further warning.
 The
 .Fn openpam_readlinev
 function may be used to achieve similar results.
 .Ef
 .Pp
 The
 .Fn openpam_readline
 function reads a line from a file, and returns it
 in a NUL-terminated buffer allocated with
 .Xr malloc 3 .
 .Pp
 The
 .Fn openpam_readline
 function performs a certain amount of processing
 on the data it reads:
 .Bl -bullet
 .It
 Comments (introduced by a hash sign) are stripped.
 .It
 Blank lines are ignored.
 .It
 If a line ends in a backslash, the backslash is stripped and the
 next line is appended.
 .El
 .Pp
 If
 .Fa lineno
 is not
 .Dv NULL ,
 the integer variable it points to is
 incremented every time a newline character is read.
 .Pp
 If
 .Fa lenp
 is not
 .Dv NULL ,
 the length of the line (not including the
 terminating NUL character) is stored in the variable it points to.
 .Pp
 The caller is responsible for releasing the returned buffer by passing
 it to
 .Xr free 3 .
 .Pp
 .Sh RETURN VALUES
 The
 .Fn openpam_readline
 function returns
 .Dv NULL
 on failure.
 .Sh SEE ALSO
 .Xr openpam_readlinev 3 ,
 .Xr openpam_readword 3 ,
 .Xr pam 3
 .Sh STANDARDS
 The
 .Fn openpam_readline
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_readline
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_readlinev.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_readlinev.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_readlinev.3	(revision 344549)
@@ -1,123 +1,123 @@
 .\" Generated from openpam_readlinev.c by gendoc.pl
 .\" $OpenPAM: openpam_readlinev.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_READLINEV 3
 .Os
 .Sh NAME
 .Nm openpam_readlinev
 .Nd read a line from a file and split it into words
 .Sh SYNOPSIS
 .In sys/types.h
 .In stdio.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "char **"
 .Fn openpam_readlinev "FILE *f" "int *lineno" "int *lenp"
 .Sh DESCRIPTION
 The
 .Fn openpam_readlinev
 function reads a line from a file, splits it
 into words according to the rules described in the
 .Xr openpam_readword 3
 manual page, and returns a list of those words.
 .Pp
 If
 .Fa lineno
 is not
 .Dv NULL ,
 the integer variable it points to is
 incremented every time a newline character is read.
 This includes quoted or escaped newline characters and the newline
 character at the end of the line.
 .Pp
 If
 .Fa lenp
 is not
 .Dv NULL ,
 the number of words on the line is stored in the
 variable to which it points.
 .Sh RETURN VALUES
 If successful, the
 .Fn openpam_readlinev
 function returns a pointer to a
 dynamically allocated array of pointers to individual dynamically
 allocated NUL-terminated strings, each containing a single word, in the
 order in which they were encountered on the line.
 The array is terminated by a
 .Dv NULL
 pointer.
 .Pp
 The caller is responsible for freeing both the array and the individual
 strings by passing each of them to
 .Xr free 3 .
 .Pp
 If the end of the line was reached before any words were read,
 .Fn openpam_readlinev
 returns a pointer to a dynamically allocated array
 containing a single
 .Dv NULL
 pointer.
 .Pp
 The
 .Fn openpam_readlinev
 function can fail and return
 .Dv NULL
 for one of
 four reasons:
 .Bl -bullet
 .It
 The end of the file was reached before any words were read;
 .Va errno
 is
 zero,
 .Xr ferror 3
 returns zero, and
 .Xr feof 3
 returns a non-zero value.
 .It
 The end of the file was reached while a quote or backslash escape
 was in effect;
 .Va errno
 is set to
 .Dv EINVAL ,
 .Xr ferror 3
 returns zero, and
 .Xr feof 3
 returns a non-zero value.
 .It
 An error occurred while reading from the file;
 .Va errno
 is non-zero,
 .Xr ferror 3
 returns a non-zero value and
 .Xr feof 3
 returns zero.
 .It
 A
 .Xr malloc 3
 or
 .Xr realloc 3
 call failed;
 .Va errno
 is set to
 .Dv ENOMEM ,
 .Xr ferror 3
 returns a non-zero value, and
 .Xr feof 3
 may or may not return
 a non-zero value.
 .El
 .Sh SEE ALSO
 .Xr openpam_readline 3 ,
 .Xr openpam_readword 3 ,
 .Xr pam 3
 .Sh STANDARDS
 The
 .Fn openpam_readlinev
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_readlinev
 function and this manual page were
 developed by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_readword.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_readword.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_readword.3	(revision 344549)
@@ -1,116 +1,116 @@
 .\" Generated from openpam_readword.c by gendoc.pl
 .\" $OpenPAM: openpam_readword.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_READWORD 3
 .Os
 .Sh NAME
 .Nm openpam_readword
 .Nd read a word from a file, respecting shell quoting rules
 .Sh SYNOPSIS
 .In sys/types.h
 .In stdio.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "char *"
 .Fn openpam_readword "FILE *f" "int *lineno" "size_t *lenp"
 .Sh DESCRIPTION
 The
 .Fn openpam_readword
 function reads the next word from a file, and
 returns it in a NUL-terminated buffer allocated with
 .Xr malloc 3 .
 .Pp
 A word is a sequence of non-whitespace characters.
 However, whitespace characters can be included in a word if quoted or
 escaped according to the following rules:
 .Bl -bullet
 .It
 An unescaped single or double quote introduces a quoted string,
 which ends when the same quote character is encountered a second
 time.
 The quotes themselves are stripped.
 .It
 Within a single- or double-quoted string, all whitespace characters,
 including the newline character, are preserved as-is.
 .It
 Outside a quoted string, a backslash escapes the next character,
 which is preserved as-is, unless that character is a newline, in
 which case it is discarded and reading continues at the beginning of
 the next line as if the backslash and newline had not been there.
 In all cases, the backslash itself is discarded.
 .It
 Within a single-quoted string, double quotes and backslashes are
 preserved as-is.
 .It
 Within a double-quoted string, a single quote is preserved as-is,
 and a backslash is preserved as-is unless used to escape a double
 quote.
 .El
 .Pp
 In addition, if the first non-whitespace character on the line is a
 hash character (#), the rest of the line is discarded.
 If a hash character occurs within a word, however, it is preserved
 as-is.
 A backslash at the end of a comment does cause line continuation.
 .Pp
 If
 .Fa lineno
 is not
 .Dv NULL ,
 the integer variable it points to is
 incremented every time a quoted or escaped newline character is read.
 .Pp
 If
 .Fa lenp
 is not
 .Dv NULL ,
 the length of the word (after quotes and
 backslashes have been removed) is stored in the variable it points to.
 .Sh RETURN VALUES
 If successful, the
 .Fn openpam_readword
 function returns a pointer to a
 dynamically allocated NUL-terminated string containing the first word
 encountered on the line.
 .Pp
 The caller is responsible for releasing the returned buffer by passing
 it to
 .Xr free 3 .
 .Pp
 If
 .Fn openpam_readword
 reaches the end of the line or file before any
 characters are copied to the word, it returns
 .Dv NULL .
 In the former
 case, the newline is pushed back to the file.
 .Pp
 If
 .Fn openpam_readword
 reaches the end of the file while a quote or
 backslash escape is in effect, it sets
 .Va errno
 to
 .Dv EINVAL
 and returns
 .Dv NULL .
 .Sh IMPLEMENTATION NOTES
 The parsing rules are intended to be equivalent to the normal POSIX
 shell quoting rules.
 Any discrepancy is a bug and should be reported to the author along
 with sample input that can be used to reproduce the error.
 .Pp
 .Sh SEE ALSO
 .Xr openpam_readline 3 ,
 .Xr openpam_readlinev 3 ,
 .Xr pam 3
 .Sh STANDARDS
 The
 .Fn openpam_readword
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_readword
 function and this manual page were
 developed by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_restore_cred.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_restore_cred.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_restore_cred.3	(revision 344549)
@@ -1,57 +1,57 @@
 .\" Generated from openpam_restore_cred.c by gendoc.pl
 .\" $OpenPAM: openpam_restore_cred.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_RESTORE_CRED 3
 .Os
 .Sh NAME
 .Nm openpam_restore_cred
 .Nd restore credentials
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_restore_cred "pam_handle_t *pamh"
 .Sh DESCRIPTION
 The
 .Fn openpam_restore_cred
 function restores the credentials saved by
 .Xr openpam_borrow_cred 3 .
 .Pp
 .Sh RETURN VALUES
 The
 .Fn openpam_restore_cred
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_NO_MODULE_DATA
 Module data not found.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr setegid 2 ,
 .Xr seteuid 2 ,
 .Xr setgroups 2 ,
 .Xr openpam_borrow_cred 3 ,
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 The
 .Fn openpam_restore_cred
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_restore_cred
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_set_feature.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_set_feature.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_set_feature.3	(revision 344549)
@@ -1,53 +1,53 @@
 .\" Generated from openpam_set_feature.c by gendoc.pl
 .\" $OpenPAM: openpam_set_feature.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_SET_FEATURE 3
 .Os
 .Sh NAME
 .Nm openpam_set_feature
 .Nd enable or disable an optional feature
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_set_feature "int feature" "int onoff"
 .Sh DESCRIPTION
 .Bf Sy
 This function is experimental and may be modified or removed in a future release without prior warning.
 .Ef
 .Pp
 The
 .Fn openpam_set_feature
 function sets the state of the specified
 feature to the value specified by the
 .Fa onoff
 argument.
 See
 .Xr openpam_get_feature 3
 for a list of recognized features.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn openpam_set_feature
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BAD_FEATURE
 Unrecognized or restricted feature.
 .El
 .Sh SEE ALSO
 .Xr openpam_get_feature 3 ,
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 The
 .Fn openpam_set_feature
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_set_feature
 function and this manual page were
 developed by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_set_option.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_set_option.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_set_option.3	(revision 344549)
@@ -1,54 +1,54 @@
 .\" Generated from openpam_set_option.c by gendoc.pl
 .\" $OpenPAM: openpam_set_option.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_SET_OPTION 3
 .Os
 .Sh NAME
 .Nm openpam_set_option
 .Nd sets the value of a module option
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_set_option "pam_handle_t *pamh" "const char *option" "const char *value"
 .Sh DESCRIPTION
 The
 .Fn openpam_set_option
 function sets the specified option in the
 context of the currently executing service module.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn openpam_set_option
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr openpam_get_option 3 ,
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 The
 .Fn openpam_set_option
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_set_option
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_straddch.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_straddch.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_straddch.3	(revision 344549)
@@ -1,103 +1,103 @@
 .\" Generated from openpam_straddch.c by gendoc.pl
 .\" $OpenPAM: openpam_straddch.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_STRADDCH 3
 .Os
 .Sh NAME
 .Nm openpam_straddch
 .Nd add a character to a string, expanding the buffer if needed
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_straddch "char **str" "size_t *size" "size_t *len" "int ch"
 .Sh DESCRIPTION
 The
 .Fn openpam_straddch
 function appends a character to a dynamically
 allocated NUL-terminated buffer, reallocating the buffer as needed.
 .Pp
 The
 .Fa str
 argument points to a variable containing either a pointer to
 an existing buffer or
 .Dv NULL .
 If the value of the variable pointed to by
 .Fa str
 is
 .Dv NULL ,
 a new buffer
 is allocated.
 .Pp
 The
 .Fa size
 and
 .Fa len
 argument point to variables used to hold the size
 of the buffer and the length of the string it contains, respectively.
 .Pp
 The final argument,
 .Fa ch ,
 is the character that should be appended to
 the string.  If
 .Fa ch
 is 0, nothing is appended, but a new buffer is
 still allocated if
 .Fa str
 is NULL.  This can be used to
 .Do
 bootstrap
 .Dc
 the
 string.
 .Pp
 If a new buffer is allocated or an existing buffer is reallocated to
 make room for the additional character,
 .Fa str
 and
 .Fa size
 are updated
 accordingly.
 .Pp
 The
 .Fn openpam_straddch
 function ensures that the buffer is always
 NUL-terminated.
 .Pp
 If the
 .Fn openpam_straddch
 function is successful, it increments the
 integer variable pointed to by
 .Fa len
 (unless
 .Fa ch
 was 0) and returns 0.
 Otherwise, it leaves the variables pointed to by
 .Fa str ,
 .Fa size
 and
 .Fa len
 unmodified, sets
 .Va errno
 to
 .Dv ENOMEM
 and returns -1.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn openpam_straddch
 function returns 0 on success and -1 on failure.
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 The
 .Fn openpam_straddch
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_straddch
 function and this manual page were
 developed by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_subst.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_subst.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_subst.3	(revision 344549)
@@ -1,106 +1,106 @@
 .\" Generated from openpam_subst.c by gendoc.pl
 .\" $OpenPAM: openpam_subst.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_SUBST 3
 .Os
 .Sh NAME
 .Nm openpam_subst
 .Nd substitute PAM item values in a string
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_subst "const pam_handle_t *pamh" "char *buf" "size_t *bufsize" "const char *template"
 .Sh DESCRIPTION
 The
 .Fn openpam_subst
 function expands a string, substituting PAM item
 values for all occurrences of specific substitution codes.
 The
 .Fa template
 argument points to the initial string.
 The result is stored in the buffer pointed to by the
 .Fa buf
 argument; the
 .Fa bufsize
 argument specifies the size of that buffer.
 The actual size of the resulting string, including the terminating NUL
 character, is stored in the location pointed to by the
 .Fa bufsize
 argument.
 .Pp
 If
 .Fa buf
 is NULL, or if the buffer is too small to hold the expanded
 string,
 .Fa bufsize
 is updated to reflect the amount of space required to
 hold the entire string, and
 .Fn openpam_subst
 returns
 .Dv PAM_TRY_AGAIN .
 .Pp
 If
 .Fn openpam_subst
 fails for any other reason, the
 .Fa bufsize
 argument is
 untouched, but part of the buffer may still have been overwritten.
 .Pp
 Substitution codes are introduced by a percent character and correspond
 to PAM items:
 .Bl -tag -width 18n
 .It \&%H
 Replaced by the current value of the
 .Dv PAM_RHOST
 item.
 .It \&%h
 Replaced by the current value of the
 .Dv PAM_HOST
 item.
 .It \&%s
 Replaced by the current value of the
 .Dv PAM_SERVICE
 item.
 .It \&%t
 Replaced by the current value of the
 .Dv PAM_TTY
 item.
 .It \&%U
 Replaced by the current value of the
 .Dv PAM_RUSER
 item.
 .It \&%u
 Replaced by the current value of the
 .Dv PAM_USER
 item.
 .El
 .Sh RETURN VALUES
 The
 .Fn openpam_subst
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BAD_ITEM
 Unrecognized or restricted item.
 .It Bq Er PAM_TRY_AGAIN
 Try again.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_get_authtok 3 ,
 .Xr pam_get_item 3 ,
 .Xr pam_get_user 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 The
 .Fn openpam_subst
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_subst
 function and this manual page were
 developed by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/openpam_ttyconv.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/openpam_ttyconv.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/openpam_ttyconv.3	(revision 344549)
@@ -1,67 +1,67 @@
 .\" Generated from openpam_ttyconv.c by gendoc.pl
 .\" $OpenPAM: openpam_ttyconv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt OPENPAM_TTYCONV 3
 .Os
 .Sh NAME
 .Nm openpam_ttyconv
 .Nd simple tty-based conversation function
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/openpam.h
 .Ft "int"
 .Fn openpam_ttyconv "int n" "const struct pam_message **msg" "struct pam_response **resp" "void *data"
 .Sh DESCRIPTION
 The
 .Fn openpam_ttyconv
 function is a standard conversation function
 suitable for use on TTY devices.
 It should be adequate for the needs of most text-based interactive
 programs.
 .Pp
 The
 .Fn openpam_ttyconv
 function allows the application to specify a
 timeout for user input by setting the global integer variable
 .Va openpam_ttyconv_timeout
 to the length of the timeout in seconds.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn openpam_ttyconv
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr openpam_nullconv 3 ,
 .Xr pam 3 ,
 .Xr pam_prompt 3 ,
 .Xr pam_strerror 3 ,
 .Xr pam_vprompt 3
 .Sh STANDARDS
 The
 .Fn openpam_ttyconv
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn openpam_ttyconv
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam.3	(revision 344549)
@@ -1,269 +1,269 @@
 .\" Generated by gendoc.pl
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM 3
 .Os
 .Sh NAME
 .Nm pam_acct_mgmt ,
 .Nm pam_authenticate ,
 .Nm pam_chauthtok ,
 .Nm pam_close_session ,
 .Nm pam_end ,
 .Nm pam_get_data ,
 .Nm pam_get_item ,
 .Nm pam_get_user ,
 .Nm pam_getenv ,
 .Nm pam_getenvlist ,
 .Nm pam_open_session ,
 .Nm pam_putenv ,
 .Nm pam_set_data ,
 .Nm pam_set_item ,
 .Nm pam_setcred ,
 .Nm pam_start ,
 .Nm pam_strerror
 .Nd Pluggable Authentication Modules Library
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags"
 .Ft "int"
 .Fn pam_authenticate "pam_handle_t *pamh" "int flags"
 .Ft "int"
 .Fn pam_chauthtok "pam_handle_t *pamh" "int flags"
 .Ft "int"
 .Fn pam_close_session "pam_handle_t *pamh" "int flags"
 .Ft "int"
 .Fn pam_end "pam_handle_t *pamh" "int status"
 .Ft "int"
 .Fn pam_get_data "const pam_handle_t *pamh" "const char *module_data_name" "const void **data"
 .Ft "int"
 .Fn pam_get_item "const pam_handle_t *pamh" "int item_type" "const void **item"
 .Ft "int"
 .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt"
 .Ft "const char *"
 .Fn pam_getenv "pam_handle_t *pamh" "const char *name"
 .Ft "char **"
 .Fn pam_getenvlist "pam_handle_t *pamh"
 .Ft "int"
 .Fn pam_open_session "pam_handle_t *pamh" "int flags"
 .Ft "int"
 .Fn pam_putenv "pam_handle_t *pamh" "const char *namevalue"
 .Ft "int"
 .Fn pam_set_data "pam_handle_t *pamh" "const char *module_data_name" "void *data" "void (*cleanup)(pam_handle_t *pamh, void *data, int pam_end_status)"
 .Ft "int"
 .Fn pam_set_item "pam_handle_t *pamh" "int item_type" "const void *item"
 .Ft "int"
 .Fn pam_setcred "pam_handle_t *pamh" "int flags"
 .Ft "int"
 .Fn pam_start "const char *service" "const char *user" "const struct pam_conv *pam_conv" "pam_handle_t **pamh"
 .Ft "const char *"
 .Fn pam_strerror "const pam_handle_t *pamh" "int error_number"
 .\"
 .\" $OpenPAM: pam.man 938 2017-04-30 21:34:42Z des $
 .\"
 .Sh DESCRIPTION
 The Pluggable Authentication Modules (PAM) library abstracts a number
 of common authentication-related operations and provides a framework
 for dynamically loaded modules that implement these operations in
 various ways.
 .Ss Terminology
 In PAM parlance, the application that uses PAM to authenticate a user
 is the server, and is identified for configuration purposes by a
 service name, which is often (but not necessarily) the program name.
 .Pp
 The user requesting authentication is called the applicant, while the
 user (usually, root) charged with verifying his identity and granting
 him the requested credentials is called the arbitrator.
 .Pp
 The sequence of operations the server goes through to authenticate a
 user and perform whatever task he requested is a PAM transaction; the
 context within which the server performs the requested task is called
 a session.
 .Pp
 The functionality embodied by PAM is divided into six primitives
 grouped into four facilities: authentication, account management,
 session management and password management.
 .Ss Conversation
 The PAM library expects the application to provide a conversation
 callback which it can use to communicate with the user.
 Some modules may use specialized conversation functions to communicate
 with special hardware such as cryptographic dongles or biometric
 devices.
 See
 .Xr pam_conv 3
 for details.
 .Ss Initialization and Cleanup
 The
 .Fn pam_start
 function initializes the PAM library and returns a handle which must
 be provided in all subsequent function calls.
 The transaction state is contained entirely within the structure
 identified by this handle, so it is possible to conduct multiple
 transactions in parallel.
 .Pp
 The
 .Fn pam_end
 function releases all resources associated with the specified context,
 and can be called at any time to terminate a PAM transaction.
 .Ss Storage
 The
 .Fn pam_set_item
 and
 .Fn pam_get_item
 functions set and retrieve a number of predefined items, including the
 service name, the names of the requesting and target users, the
 conversation function, and prompts.
 .Pp
 The
 .Fn pam_set_data
 and
 .Fn pam_get_data
 functions manage named chunks of free-form data, generally used by
 modules to store state from one invocation to another.
 .Ss Authentication
 There are two authentication primitives:
 .Fn pam_authenticate
 and
 .Fn pam_setcred .
 The former authenticates the user, while the latter manages his
 credentials.
 .Ss Account Management
 The
 .Fn pam_acct_mgmt
 function enforces policies such as password expiry, account expiry,
 time-of-day restrictions, and so forth.
 .Ss Session Management
 The
 .Fn pam_open_session
 and
 .Fn pam_close_session
 functions handle session setup and teardown.
 .Ss Password Management
 The
 .Fn pam_chauthtok
 function allows the server to change the user's password, either at
 the user's request or because the password has expired.
 .Ss Miscellaneous
 The
 .Fn pam_putenv ,
 .Fn pam_getenv
 and
 .Fn pam_getenvlist
 functions manage a private environment list in which modules can set
 environment variables they want the server to export during the
 session.
 .Pp
 The
 .Fn pam_strerror
 function returns a pointer to a string describing the specified PAM
 error code.
 .Sh RETURN VALUES
 The following return codes are defined by
 .In security/pam_constants.h :
 .Bl -tag -width 18n
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_ACCT_EXPIRED
 User account has expired.
 .It Bq Er PAM_AUTHINFO_UNAVAIL
 Authentication information is unavailable.
 .It Bq Er PAM_AUTHTOK_DISABLE_AGING
 Authentication token aging disabled.
 .It Bq Er PAM_AUTHTOK_ERR
 Authentication token failure.
 .It Bq Er PAM_AUTHTOK_EXPIRED
 Password has expired.
 .It Bq Er PAM_AUTHTOK_LOCK_BUSY
 Authentication token lock busy.
 .It Bq Er PAM_AUTHTOK_RECOVERY_ERR
 Failed to recover old authentication token.
 .It Bq Er PAM_AUTH_ERR
 Authentication error.
 .It Bq Er PAM_BAD_CONSTANT
 Bad constant.
 .It Bq Er PAM_BAD_FEATURE
 Unrecognized or restricted feature.
 .It Bq Er PAM_BAD_HANDLE
 Invalid PAM handle.
 .It Bq Er PAM_BAD_ITEM
 Unrecognized or restricted item.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_CRED_ERR
 Failed to set user credentials.
 .It Bq Er PAM_CRED_EXPIRED
 User credentials have expired.
 .It Bq Er PAM_CRED_INSUFFICIENT
 Insufficient credentials.
 .It Bq Er PAM_CRED_UNAVAIL
 Failed to retrieve user credentials.
 .It Bq Er PAM_DOMAIN_UNKNOWN
 Unknown authentication domain.
 .It Bq Er PAM_IGNORE
 Ignore this module.
 .It Bq Er PAM_MAXTRIES
 Maximum number of tries exceeded.
 .It Bq Er PAM_MODULE_UNKNOWN
 Unknown module type.
 .It Bq Er PAM_NEW_AUTHTOK_REQD
 New authentication token required.
 .It Bq Er PAM_NO_MODULE_DATA
 Module data not found.
 .It Bq Er PAM_OPEN_ERR
 Failed to load module.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SESSION_ERR
 Session failure.
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_SYMBOL_ERR
 Invalid symbol.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_TRY_AGAIN
 Try again.
 .It Bq Er PAM_USER_UNKNOWN
 Unknown user.
 .El
 .Sh SEE ALSO
 .Xr openpam 3 ,
 .Xr pam_acct_mgmt 3 ,
 .Xr pam_authenticate 3 ,
 .Xr pam_chauthtok 3 ,
 .Xr pam_close_session 3 ,
 .Xr pam_conv 3 ,
 .Xr pam_end 3 ,
 .Xr pam_get_data 3 ,
 .Xr pam_getenv 3 ,
 .Xr pam_getenvlist 3 ,
 .Xr pam_get_item 3 ,
 .Xr pam_get_user 3 ,
 .Xr pam_open_session 3 ,
 .Xr pam_putenv 3 ,
 .Xr pam_setcred 3 ,
 .Xr pam_set_data 3 ,
 .Xr pam_set_item 3 ,
 .Xr pam_start 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The OpenPAM library and this manual page were developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam.conf.5
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam.conf.5	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam.conf.5	(revision 344549)
@@ -1,215 +1,215 @@
 .\"-
 .\" Copyright (c) 2005-2017 Dag-Erling Smørgrav
 .\" 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. The name of the author may not be used to endorse or promote
 .\"    products derived from this software without specific prior written
 .\"    permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
 .\"
-.\" $OpenPAM: pam.conf.5 939 2017-04-30 21:36:50Z des $
+.\" $OpenPAM: pam.conf.5 947 2019-02-24 20:18:17Z des $
 .\"
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM.CONF 5
 .Os
 .Sh NAME
 .Nm pam.conf
 .Nd PAM policy file format
 .Sh DESCRIPTION
 The PAM library searches for policies in the following files, in
 decreasing order of preference:
 .Bl -enum
 .It
 .Pa /etc/pam.d/ Ns Ar service-name
 .It
 .Pa /etc/pam.conf
 .It
 .Pa /usr/local/etc/pam.d/ Ns Ar service-name
 .It
 .Pa /usr/local/etc/pam.conf
 .El
 .Pp
 If none of these locations contains a policy for the given service,
 the
 .Dq Dv other
 policy is used instead, if it exists.
 .Pp
 Entries in per-service policy files must be of one of the two forms
 below:
 .Bd -unfilled -offset indent
 .Ar facility control-flag module-path Op Ar arguments ...
 .Ar facility Cm include Ar other-service-name
 .Ed
 .Pp
 Entries in
 .Pa pam.conf Ns -style
 policy files are of the same form, but are prefixed by an additional
 field specifying the name of the service they apply to.
 .Pp
 In both cases, blank lines and comments introduced by a
 .Ql #
 sign are ignored, and the normal shell quoting rules apply.
 The precise details of how the file is tokenized are described in
 .Xr openpam_readword 3 .
 .Pp
 The
 .Ar facility
 field specifies the facility the entry applies to, and is one of:
 .Bl -tag -width 12n
 .It Cm auth
 Authentication functions
 .Po
 .Xr pam_authenticate 3 ,
 .Xr pam_setcred 3
 .Pc
 .It Cm account
 Account management functions
 .Pq Xr pam_acct_mgmt 3
 .It Cm session
 Session handling functions
 .Po
 .Xr pam_open_session 3 ,
 .Xr pam_close_session 3
 .Pc
 .It Cm password
 Password management functions
 .Pq Xr pam_chauthtok 3
 .El
 .Pp
 The
 .Ar control-flag
 field determines how the result returned by the module affects the
 flow of control through (and the final result of) the rest of the
 chain, and is one of:
 .Bl -tag -width 12n
 .It Cm required
 If this module succeeds, the result of the chain will be success
 unless a later module fails.
 If it fails, the rest of the chain still runs, but the final result
 will be failure regardless of the success of later modules.
 .It Cm requisite
 If this module succeeds, the result of the chain will be success
 unless a later module fails.
 If the module fails, the chain is broken and the result is failure.
 .It Cm sufficient
 If this module succeeds, the chain is broken and the result is
 success.
 If it fails, the rest of the chain still runs, but the final result
 will be failure unless a later module succeeds.
 .It Cm binding
 If this module succeeds, the chain is broken and the result is
 success.
 If it fails, the rest of the chain still runs, but the final result
 will be failure regardless of the success of later modules.
 .It Cm optional
 If this module succeeds, the result of the chain will be success
 unless a later module fails.
 If this module fails, the result of the chain will be failure unless a
 later module succeeds.
 .El
 .Pp
 There are two exceptions to the above:
 .Cm sufficient
 and
 .Cm binding
 modules are treated as
 .Cm optional
 by
 .Xr pam_setcred 3 ,
 and in the
 .Dv PAM_PRELIM_CHECK
 phase of
 .Xr pam_chauthtok 3 .
 .Pp
 The
 .Ar module-path
 field specifies the name or full path of the module to call.
 If only the name is specified, the PAM library will search for it in
 the following locations:
 .Bl -enum
 .It
 .Pa /usr/lib
 .It
 .Pa /usr/local/lib
 .El
 .Pp
 The remaining fields, if any, are passed unmodified to the module if
 and when it is invoked.
 .Pp
 The
 .Cm include
 form of entry causes entries from a different chain (specified by
 .Ar other-system-name )
 to be included in the current one.
 This allows one to define system-wide policies which are then included
 into service-specific policies.
 The system-wide policy can then be modified without having to also
 modify each and every service-specific policy.
 .Pp
 .Bf -symbolic
 Take care not to introduce loops when using
 .Cm include
 rules, as there is currently no loop detection in place.
 .Ef
 .Sh MODULE OPTIONS
 Some PAM library functions may alter their behavior when called by a
 service module if certain module options were specified, regardless of
 whether the module itself accords them any importance.
 One such option is
 .Cm debug ,
 which causes the dispatcher to enable debugging messages before
 calling each service function, and disable them afterwards (unless
 they were already enabled).
 Other special options include:
 .Bl -tag -width 12n
 .It Cm authtok_prompt Ns = Ns Ar prompt , Cm oldauthtok_prompt Ns = Ns Ar prompt , Cm user_prompt Ns = Ns Ar prompt
 These options can be used to override the prompts used by
 .Xr pam_get_authtok 3
 and
 .Xr pam_get_user 3 .
 .It Cm echo_pass
 This option controls whether
 .Xr pam_get_authtok 3
 will allow the user to see what they are typing.
 .It Cm try_first_pass , Cm use_first_pass
 These options control
 .Xr pam_get_authtok 3 Ns 's
 use of cached authentication tokens.
 .El
 .Sh SEE ALSO
 .Xr pam 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The OpenPAM library was developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_acct_mgmt.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_acct_mgmt.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_acct_mgmt.3	(revision 344549)
@@ -1,84 +1,84 @@
 .\" Generated from pam_acct_mgmt.c by gendoc.pl
 .\" $OpenPAM: pam_acct_mgmt.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_ACCT_MGMT 3
 .Os
 .Sh NAME
 .Nm pam_acct_mgmt
 .Nd perform PAM account validation procedures
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_acct_mgmt "pam_handle_t *pamh" "int flags"
 .Sh DESCRIPTION
 The
 .Fn pam_acct_mgmt
 function verifies and enforces account restrictions
 after the user has been authenticated.
 .Pp
 The
 .Fa flags
 argument is the binary or of zero or more of the following
 values:
 .Bl -tag -width 18n
 .It Dv PAM_SILENT
 Do not emit any messages.
 .It Dv PAM_DISALLOW_NULL_AUTHTOK
 Fail if the user's authentication token is null.
 .El
 .Pp
 If any other bits are set,
 .Fn pam_acct_mgmt
 will return
 .Dv PAM_SYMBOL_ERR .
 .Sh RETURN VALUES
 The
 .Fn pam_acct_mgmt
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_ACCT_EXPIRED
 User account has expired.
 .It Bq Er PAM_AUTH_ERR
 Authentication error.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_NEW_AUTHTOK_REQD
 New authentication token required.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_USER_UNKNOWN
 Unknown user.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_acct_mgmt
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_authenticate.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_authenticate.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_authenticate.3	(revision 344549)
@@ -1,98 +1,98 @@
 .\" Generated from pam_authenticate.c by gendoc.pl
 .\" $OpenPAM: pam_authenticate.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_AUTHENTICATE 3
 .Os
 .Sh NAME
 .Nm pam_authenticate
 .Nd perform authentication within the PAM framework
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_authenticate "pam_handle_t *pamh" "int flags"
 .Sh DESCRIPTION
 The
 .Fn pam_authenticate
 function attempts to authenticate the user
 associated with the pam context specified by the
 .Fa pamh
 argument.
 .Pp
 The application is free to call
 .Fn pam_authenticate
 as many times as it
 wishes, but some modules may maintain an internal retry counter and
 return
 .Dv PAM_MAXTRIES
 when it exceeds some preset or hardcoded limit.
 .Pp
 The
 .Fa flags
 argument is the binary or of zero or more of the following
 values:
 .Bl -tag -width 18n
 .It Dv PAM_SILENT
 Do not emit any messages.
 .It Dv PAM_DISALLOW_NULL_AUTHTOK
 Fail if the user's authentication token is null.
 .El
 .Pp
 If any other bits are set,
 .Fn pam_authenticate
 will return
 .Dv PAM_BAD_CONSTANT .
 .Sh RETURN VALUES
 The
 .Fn pam_authenticate
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_AUTHINFO_UNAVAIL
 Authentication information is unavailable.
 .It Bq Er PAM_AUTH_ERR
 Authentication error.
 .It Bq Er PAM_BAD_CONSTANT
 Bad constant.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_CRED_INSUFFICIENT
 Insufficient credentials.
 .It Bq Er PAM_MAXTRIES
 Maximum number of tries exceeded.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_USER_UNKNOWN
 Unknown user.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_authenticate
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_chauthtok.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_chauthtok.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_chauthtok.3	(revision 344549)
@@ -1,90 +1,90 @@
 .\" Generated from pam_chauthtok.c by gendoc.pl
 .\" $OpenPAM: pam_chauthtok.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_CHAUTHTOK 3
 .Os
 .Sh NAME
 .Nm pam_chauthtok
 .Nd perform password related functions within the PAM framework
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_chauthtok "pam_handle_t *pamh" "int flags"
 .Sh DESCRIPTION
 The
 .Fn pam_chauthtok
 function attempts to change the authentication token
 for the user associated with the pam context specified by the
 .Fa pamh
 argument.
 .Pp
 The
 .Fa flags
 argument is the binary or of zero or more of the following
 values:
 .Bl -tag -width 18n
 .It Dv PAM_SILENT
 Do not emit any messages.
 .It Dv PAM_CHANGE_EXPIRED_AUTHTOK
 Change only those authentication tokens that have expired.
 .El
 .Pp
 If any other bits are set,
 .Fn pam_chauthtok
 will return
 .Dv PAM_BAD_CONSTANT .
 .Sh RETURN VALUES
 The
 .Fn pam_chauthtok
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_AUTHTOK_DISABLE_AGING
 Authentication token aging disabled.
 .It Bq Er PAM_AUTHTOK_ERR
 Authentication token failure.
 .It Bq Er PAM_AUTHTOK_LOCK_BUSY
 Authentication token lock busy.
 .It Bq Er PAM_AUTHTOK_RECOVERY_ERR
 Failed to recover old authentication token.
 .It Bq Er PAM_BAD_CONSTANT
 Bad constant.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_TRY_AGAIN
 Try again.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_chauthtok
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_close_session.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_close_session.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_close_session.3	(revision 344549)
@@ -1,80 +1,80 @@
 .\" Generated from pam_close_session.c by gendoc.pl
 .\" $OpenPAM: pam_close_session.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_CLOSE_SESSION 3
 .Os
 .Sh NAME
 .Nm pam_close_session
 .Nd close an existing user session
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_close_session "pam_handle_t *pamh" "int flags"
 .Sh DESCRIPTION
 The
 .Fn pam_close_session
 function tears down the user session previously
 set up by
 .Xr pam_open_session 3 .
 .Pp
 The
 .Fa flags
 argument is the binary or of zero or more of the following
 values:
 .Bl -tag -width 18n
 .It Dv PAM_SILENT
 Do not emit any messages.
 .El
 .Pp
 If any other bits are set,
 .Fn pam_close_session
 will return
 .Dv PAM_BAD_CONSTANT .
 .Sh RETURN VALUES
 The
 .Fn pam_close_session
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_BAD_CONSTANT
 Bad constant.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SESSION_ERR
 Session failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_open_session 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_close_session
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_conv.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_conv.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_conv.3	(revision 344549)
@@ -1,186 +1,186 @@
 .\"-
 .\" Copyright (c) 2002-2003 Networks Associates Technology, Inc.
 .\" Copyright (c) 2004-2017 Dag-Erling Smørgrav
 .\" All rights reserved.
 .\"
 .\" This software was developed for the FreeBSD Project by ThinkSec AS and
 .\" Network Associates Laboratories, the Security Research Division of
 .\" Network Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035
 .\" ("CBOSS"), as part of the DARPA CHATS research program.
 .\"
 .\" 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. The name of the author may not be used to endorse or promote
 .\"    products derived from this software without specific prior written
 .\"    permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
 .\"
-.\" $OpenPAM: pam_conv.3 939 2017-04-30 21:36:50Z des $
+.\" $OpenPAM: pam_conv.3 947 2019-02-24 20:18:17Z des $
 .\"
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_CONV 3
 .Os
 .Sh NAME
 .Nm pam_conv
 .Nd PAM conversation system
 .Sh LIBRARY
 .Lb libpam
 .Sh SYNOPSIS
 .In security/pam_appl.h
 .Bd -literal
 struct pam_message {
 	int      msg_style;
 	char    *msg;
 };
 
 struct pam_response {
 	char    *resp;
 	int      resp_retcode;
 };
 
 struct pam_conv {
 	int     (*conv)(int, const struct pam_message **,
 	    struct pam_response **, void *);
 	void    *appdata_ptr;
 };
 .Ed
 .Sh DESCRIPTION
 The PAM library uses an application-defined callback to communicate
 with the user.
 This callback is specified by the
 .Vt struct pam_conv
 passed to
 .Fn pam_start
 at the start of the transaction.
 It is also possible to set or change the conversation function at any
 point during a PAM transaction by changing the value of the
 .Dv PAM_CONV
 item.
 .Pp
 The conversation function's first argument specifies the number of
 messages (up to
 .Dv PAM_MAX_NUM_MSG )
 to process.
 The second argument is a pointer to an array of pointers to
 .Vt pam_message
 structures containing the actual messages.
 .Pp
 Each message can have one of four types, specified by the
 .Va msg_style
 member of
 .Vt struct pam_message :
 .Bl -tag -width 18n
 .It Dv PAM_PROMPT_ECHO_OFF
 Display a prompt and accept the user's response without echoing it to
 the terminal.
 This is commonly used for passwords.
 .It Dv PAM_PROMPT_ECHO_ON
 Display a prompt and accept the user's response, echoing it to the
 terminal.
 This is commonly used for login names and one-time passphrases.
 .It Dv PAM_ERROR_MSG
 Display an error message.
 .It Dv PAM_TEXT_INFO
 Display an informational message.
 .El
 .Pp
 In each case, the prompt or message to display is pointed to by the
 .Va msg
 member of
 .Vt struct pam_message .
 It can be up to
 .Dv PAM_MAX_MSG_SIZE
 characters long, including the terminating NUL.
 .Pp
 On success, the conversation function should allocate and fill a
 contiguous array of
 .Vt struct pam_response ,
 one for each message that was passed in.
 A pointer to the user's response to each message (or
 .Dv NULL
 in the case of informational or error messages) should be stored in
 the
 .Va resp
 member of the corresponding
 .Vt struct pam_response .
 Each response can be up to
 .Dv PAM_MAX_RESP_SIZE
 characters long, including the terminating NUL.
 .Pp
 The
 .Va resp_retcode
 member of
 .Vt struct pam_response
 is unused and should be set to zero.
 .Pp
 The conversation function should store a pointer to this array in the
 location pointed to by its third argument.
 It is the caller's responsibility to release both this array and the
 responses themselves, using
 .Xr free 3 .
 It is the conversation function's responsibility to ensure that it is
 legal to do so.
 .Pp
 The
 .Va appdata_ptr
 member of
 .Vt struct pam_conv
 is passed unmodified to the conversation function as its fourth and
 final argument.
 .Pp
 On failure, the conversation function should release any resources it
 has allocated, and return one of the predefined PAM error codes.
 .Sh RETURN VALUES
 The conversation function should return one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr openpam_nullconv 3 ,
 .Xr openpam_ttyconv 3 ,
 .Xr pam 3 ,
 .Xr pam_error 3 ,
 .Xr pam_get_item 3 ,
 .Xr pam_info 3 ,
 .Xr pam_prompt 3 ,
 .Xr pam_set_item 3 ,
 .Xr pam_start 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The OpenPAM library and this manual page were developed for the
 FreeBSD Project by ThinkSec AS and Network Associates Laboratories,
 the Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_end.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_end.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_end.3	(revision 344549)
@@ -1,56 +1,56 @@
 .\" Generated from pam_end.c by gendoc.pl
 .\" $OpenPAM: pam_end.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_END 3
 .Os
 .Sh NAME
 .Nm pam_end
 .Nd terminate the PAM transaction
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_end "pam_handle_t *pamh" "int status"
 .Sh DESCRIPTION
 The
 .Fn pam_end
 function terminates a PAM transaction and destroys the
 corresponding PAM context, releasing all resources allocated to it.
 .Pp
 The
 .Fa status
 argument should be set to the error code returned by the
 last API call before the call to
 .Fn pam_end .
 .Sh RETURN VALUES
 The
 .Fn pam_end
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BAD_HANDLE
 Invalid PAM handle.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_end
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_error.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_error.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_error.3	(revision 344549)
@@ -1,57 +1,57 @@
 .\" Generated from pam_error.c by gendoc.pl
 .\" $OpenPAM: pam_error.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_ERROR 3
 .Os
 .Sh NAME
 .Nm pam_error
 .Nd display an error message
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_error "const pam_handle_t *pamh" "const char *fmt" "..."
 .Sh DESCRIPTION
 The
 .Fn pam_error
 function displays an error message through the
 intermediary of the given PAM context's conversation function.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_error
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_info 3 ,
 .Xr pam_prompt 3 ,
 .Xr pam_strerror 3 ,
 .Xr pam_verror 3
 .Sh STANDARDS
 The
 .Fn pam_error
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn pam_error
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_get_authtok.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_get_authtok.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_get_authtok.3	(revision 344549)
@@ -1,164 +1,164 @@
 .\" Generated from pam_get_authtok.c by gendoc.pl
 .\" $OpenPAM: pam_get_authtok.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_GET_AUTHTOK 3
 .Os
 .Sh NAME
 .Nm pam_get_authtok
 .Nd retrieve authentication token
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_get_authtok "pam_handle_t *pamh" "int item" "const char **authtok" "const char *prompt"
 .Sh DESCRIPTION
 The
 .Fn pam_get_authtok
 function either prompts the user for an
 authentication token or retrieves a cached authentication token,
 depending on circumstances.
 Either way, a pointer to the authentication token is stored in the
 location pointed to by the
 .Fa authtok
 argument, and the corresponding PAM
 item is updated.
 .Pp
 The
 .Fa item
 argument must have one of the following values:
 .Bl -tag -width 18n
 .It Dv PAM_AUTHTOK
 Returns the current authentication token, or the new token
 when changing authentication tokens.
 .It Dv PAM_OLDAUTHTOK
 Returns the previous authentication token when changing
 authentication tokens.
 .El
 .Pp
 The
 .Fa prompt
 argument specifies a prompt to use if no token is cached.
 If it is
 .Dv NULL ,
 the
 .Dv PAM_AUTHTOK_PROMPT
 or
 .Dv PAM_OLDAUTHTOK_PROMPT
 item,
 as appropriate, will be used.
 If that item is also
 .Dv NULL ,
 a hardcoded default prompt will be used.
 Additionally, when
 .Fn pam_get_authtok
 is called from a service module,
 the prompt may be affected by module options as described below.
 The prompt is then expanded using
 .Xr openpam_subst 3
 before it is passed to
 the conversation function.
 .Pp
 If
 .Fa item
 is set to
 .Dv PAM_AUTHTOK
 and there is a non-null
 .Dv PAM_OLDAUTHTOK
 item,
 .Fn pam_get_authtok
 will ask the user to confirm the new token by
 retyping it.
 If there is a mismatch,
 .Fn pam_get_authtok
 will return
 .Dv PAM_TRY_AGAIN .
 .Sh MODULE OPTIONS
 When called by a service module,
 .Fn pam_get_authtok
 will recognize the
 following module options:
 .Bl -tag -width 18n
 .It Dv authtok_prompt
 Prompt to use when
 .Fa item
 is set to
 .Dv PAM_AUTHTOK .
 This option overrides both the
 .Fa prompt
 argument and the
 .Dv PAM_AUTHTOK_PROMPT
 item.
 .It Dv echo_pass
 If the application's conversation function allows it, this
 lets the user see what they are typing.
 This should only be used for non-reusable authentication
 tokens.
 .It Dv oldauthtok_prompt
 Prompt to use when
 .Fa item
 is set to
 .Dv PAM_OLDAUTHTOK .
 This option overrides both the
 .Fa prompt
 argument and the
 .Dv PAM_OLDAUTHTOK_PROMPT
 item.
 .It Dv try_first_pass
 If the requested item is non-null, return it without
 prompting the user.
 Typically, the service module will verify the token, and
 if it does not match, clear the item before calling
 .Fn pam_get_authtok
 a second time.
 .It Dv use_first_pass
 Do not prompt the user at all; just return the cached
 value, or
 .Dv PAM_AUTH_ERR
 if there is none.
 .El
 .Sh RETURN VALUES
 The
 .Fn pam_get_authtok
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BAD_CONSTANT
 Bad constant.
 .It Bq Er PAM_BAD_ITEM
 Unrecognized or restricted item.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_TRY_AGAIN
 Try again.
 .El
 .Sh SEE ALSO
 .Xr openpam_get_option 3 ,
 .Xr openpam_subst 3 ,
 .Xr pam 3 ,
 .Xr pam_conv 3 ,
 .Xr pam_get_item 3 ,
 .Xr pam_get_user 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 The
 .Fn pam_get_authtok
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn pam_get_authtok
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_get_data.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_get_data.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_get_data.3	(revision 344549)
@@ -1,69 +1,69 @@
 .\" Generated from pam_get_data.c by gendoc.pl
 .\" $OpenPAM: pam_get_data.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_GET_DATA 3
 .Os
 .Sh NAME
 .Nm pam_get_data
 .Nd get module information
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_get_data "const pam_handle_t *pamh" "const char *module_data_name" "const void **data"
 .Sh DESCRIPTION
 The
 .Fn pam_get_data
 function looks up the opaque object associated with
 the string specified by the
 .Fa module_data_name
 argument, in the PAM
 context specified by the
 .Fa pamh
 argument.
 A pointer to the object is stored in the location pointed to by the
 .Fa data
 argument.
 If
 .Fn pam_get_data
 fails, the
 .Fa data
 argument is untouched.
 .Pp
 This function and its counterpart
 .Xr pam_set_data 3
 are useful for managing
 data that are meaningful only to a particular service module.
 .Sh RETURN VALUES
 The
 .Fn pam_get_data
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_NO_MODULE_DATA
 Module data not found.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_set_data 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_get_data
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_get_item.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_get_item.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_get_item.3	(revision 344549)
@@ -1,105 +1,105 @@
 .\" Generated from pam_get_item.c by gendoc.pl
 .\" $OpenPAM: pam_get_item.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_GET_ITEM 3
 .Os
 .Sh NAME
 .Nm pam_get_item
 .Nd get PAM information
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_get_item "const pam_handle_t *pamh" "int item_type" "const void **item"
 .Sh DESCRIPTION
 The
 .Fn pam_get_item
 function stores a pointer to the item specified by
 the
 .Fa item_type
 argument in the location pointed to by the
 .Fa item
 argument.
 The item is retrieved from the PAM context specified by the
 .Fa pamh
 argument.
 If
 .Fn pam_get_item
 fails, the
 .Fa item
 argument is untouched.
 .Pp
 The following item types are recognized:
 .Bl -tag -width 18n
 .It Dv PAM_SERVICE
 The name of the requesting service.
 .It Dv PAM_USER
 The name of the user the application is trying to
 authenticate.
 .It Dv PAM_TTY
 The name of the current terminal.
 .It Dv PAM_RHOST
 The name of the applicant's host.
 .It Dv PAM_CONV
 A
 .Vt struct pam_conv
 describing the current conversation
 function.
 .It Dv PAM_AUTHTOK
 The current authentication token.
 .It Dv PAM_OLDAUTHTOK
 The expired authentication token.
 .It Dv PAM_RUSER
 The name of the applicant.
 .It Dv PAM_USER_PROMPT
 The prompt to use when asking the applicant for a user
 name to authenticate as.
 .It Dv PAM_AUTHTOK_PROMPT
 The prompt to use when asking the applicant for an
 authentication token.
 .It Dv PAM_OLDAUTHTOK_PROMPT
 The prompt to use when asking the applicant for an
 expired authentication token prior to changing it.
 .It Dv PAM_HOST
 The name of the host the application runs on.
 .El
 .Pp
 See
 .Xr pam_start 3
 for a description of
 .Vt struct pam_conv .
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_get_item
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BAD_ITEM
 Unrecognized or restricted item.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_set_item 3 ,
 .Xr pam_start 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_get_item
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_get_user.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_get_user.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_get_user.3	(revision 344549)
@@ -1,108 +1,108 @@
 .\" Generated from pam_get_user.c by gendoc.pl
 .\" $OpenPAM: pam_get_user.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_GET_USER 3
 .Os
 .Sh NAME
 .Nm pam_get_user
 .Nd retrieve user name
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_get_user "pam_handle_t *pamh" "const char **user" "const char *prompt"
 .Sh DESCRIPTION
 The
 .Fn pam_get_user
 function returns the name of the target user, as
 specified to
 .Xr pam_start 3 .
 If no user was specified, nor set using
 .Xr pam_set_item 3 ,
 .Fn pam_get_user
 will prompt for a user name.
 Either way, a pointer to the user name is stored in the location
 pointed to by the
 .Fa user
 argument, and the corresponding PAM item is
 updated.
 .Pp
 The
 .Fa prompt
 argument specifies a prompt to use if no user name is
 cached.
 If it is
 .Dv NULL ,
 the
 .Dv PAM_USER_PROMPT
 item will be used.
 If that item is also
 .Dv NULL ,
 a hardcoded default prompt will be used.
 Additionally, when
 .Fn pam_get_user
 is called from a service module, the
 prompt may be affected by module options as described below.
 The prompt is then expanded using
 .Xr openpam_subst 3
 before it is passed to
 the conversation function.
 .Sh MODULE OPTIONS
 When called by a service module,
 .Fn pam_get_user
 will recognize the
 following module options:
 .Bl -tag -width 18n
 .It Dv user_prompt
 Prompt to use when asking for the user name.
 This option overrides both the
 .Fa prompt
 argument and the
 .Dv PAM_USER_PROMPT
 item.
 .El
 .Sh RETURN VALUES
 The
 .Fn pam_get_user
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BAD_ITEM
 Unrecognized or restricted item.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr openpam_get_option 3 ,
 .Xr openpam_subst 3 ,
 .Xr pam 3 ,
 .Xr pam_conv 3 ,
 .Xr pam_get_authtok 3 ,
 .Xr pam_get_item 3 ,
 .Xr pam_set_item 3 ,
 .Xr pam_start 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_get_user
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_getenv.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_getenv.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_getenv.3	(revision 344549)
@@ -1,53 +1,53 @@
 .\" Generated from pam_getenv.c by gendoc.pl
-.\" $OpenPAM: pam_getenv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.\" $OpenPAM: pam_getenv.c 944 2019-02-22 09:49:12Z des $
+.Dd February 24, 2019
 .Dt PAM_GETENV 3
 .Os
 .Sh NAME
 .Nm pam_getenv
 .Nd retrieve the value of a PAM environment variable
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "const char *"
 .Fn pam_getenv "pam_handle_t *pamh" "const char *name"
 .Sh DESCRIPTION
 The
 .Fn pam_getenv
 function returns the value of an environment variable.
 Its semantics are similar to those of
 .Xr getenv 3 ,
 but it accesses the PAM
 context's environment list instead of the application's.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_getenv
 function returns
 .Dv NULL
 on failure.
 .Sh SEE ALSO
 .Xr getenv 3 ,
 .Xr pam 3 ,
 .Xr pam_getenvlist 3 ,
 .Xr pam_putenv 3 ,
 .Xr pam_setenv 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_getenv
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_getenvlist.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_getenvlist.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_getenvlist.3	(revision 344549)
@@ -1,74 +1,74 @@
 .\" Generated from pam_getenvlist.c by gendoc.pl
 .\" $OpenPAM: pam_getenvlist.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_GETENVLIST 3
 .Os
 .Sh NAME
 .Nm pam_getenvlist
 .Nd returns a list of all the PAM environment variables
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "char **"
 .Fn pam_getenvlist "pam_handle_t *pamh"
 .Sh DESCRIPTION
 The
 .Fn pam_getenvlist
 function returns a copy of the given PAM context's
 environment list as a pointer to an array of strings.
 The last element in the array is
 .Dv NULL .
 The pointer is suitable for assignment to
 .Va environ .
 .Pp
 The array and the strings it lists are allocated using
 .Xr malloc 3 ,
 and
 should be released using
 .Xr free 3
 after use:
 .Pp
 .Bd -literal
     char **envlist, **env;
 
     envlist = environ;
     environ = pam_getenvlist(pamh);
     /* do something nifty */
     for (env = environ; *env != NULL; env++)
         free(*env);
     free(environ);
     environ = envlist;
 .Ed
 .Sh RETURN VALUES
 The
 .Fn pam_getenvlist
 function returns
 .Dv NULL
 on failure.
 .Sh SEE ALSO
 .Xr free 3 ,
 .Xr malloc 3 ,
 .Xr pam 3 ,
 .Xr pam_getenv 3 ,
 .Xr pam_putenv 3 ,
 .Xr pam_setenv 3 ,
 .Xr environ 7
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_getenvlist
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_info.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_info.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_info.3	(revision 344549)
@@ -1,57 +1,57 @@
 .\" Generated from pam_info.c by gendoc.pl
 .\" $OpenPAM: pam_info.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_INFO 3
 .Os
 .Sh NAME
 .Nm pam_info
 .Nd display an information message
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_info "const pam_handle_t *pamh" "const char *fmt" "..."
 .Sh DESCRIPTION
 The
 .Fn pam_info
 function displays an informational message through the
 intermediary of the given PAM context's conversation function.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_info
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_error 3 ,
 .Xr pam_prompt 3 ,
 .Xr pam_strerror 3 ,
 .Xr pam_vinfo 3
 .Sh STANDARDS
 The
 .Fn pam_info
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn pam_info
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_open_session.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_open_session.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_open_session.3	(revision 344549)
@@ -1,81 +1,81 @@
 .\" Generated from pam_open_session.c by gendoc.pl
 .\" $OpenPAM: pam_open_session.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_OPEN_SESSION 3
 .Os
 .Sh NAME
 .Nm pam_open_session
 .Nd open a user session
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_open_session "pam_handle_t *pamh" "int flags"
 .Sh DESCRIPTION
 The
 .Fn pam_open_session
 sets up a user session for a previously
 authenticated user.
 The session should later be torn down by a call to
 .Xr pam_close_session 3 .
 .Pp
 The
 .Fa flags
 argument is the binary or of zero or more of the following
 values:
 .Bl -tag -width 18n
 .It Dv PAM_SILENT
 Do not emit any messages.
 .El
 .Pp
 If any other bits are set,
 .Fn pam_open_session
 will return
 .Dv PAM_BAD_CONSTANT .
 .Sh RETURN VALUES
 The
 .Fn pam_open_session
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_BAD_CONSTANT
 Bad constant.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SESSION_ERR
 Session failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_close_session 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_open_session
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_prompt.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_prompt.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_prompt.3	(revision 344549)
@@ -1,69 +1,69 @@
 .\" Generated from pam_prompt.c by gendoc.pl
 .\" $OpenPAM: pam_prompt.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_PROMPT 3
 .Os
 .Sh NAME
 .Nm pam_prompt
 .Nd call the conversation function
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_prompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "..."
 .Sh DESCRIPTION
 The
 .Fn pam_prompt
 function constructs a message from the specified format
 string and arguments and passes it to the given PAM context's
 conversation function.
 .Pp
 A pointer to the response, or
 .Dv NULL
 if the conversation function did
 not return one, is stored in the location pointed to by the
 .Fa resp
 argument.
 .Pp
 See
 .Xr pam_vprompt 3
 for further details.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_prompt
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_error 3 ,
 .Xr pam_info 3 ,
 .Xr pam_strerror 3 ,
 .Xr pam_vprompt 3
 .Sh STANDARDS
 The
 .Fn pam_prompt
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn pam_prompt
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_putenv.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_putenv.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_putenv.3	(revision 344549)
@@ -1,60 +1,60 @@
 .\" Generated from pam_putenv.c by gendoc.pl
 .\" $OpenPAM: pam_putenv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_PUTENV 3
 .Os
 .Sh NAME
 .Nm pam_putenv
 .Nd set the value of an environment variable
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_putenv "pam_handle_t *pamh" "const char *namevalue"
 .Sh DESCRIPTION
 The
 .Fn pam_putenv
 function sets an environment variable.
 Its semantics are similar to those of
 .Xr putenv 3 ,
 but it modifies the PAM
 context's environment list instead of the application's.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_putenv
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_getenv 3 ,
 .Xr pam_getenvlist 3 ,
 .Xr pam_setenv 3 ,
 .Xr pam_strerror 3 ,
 .Xr putenv 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_putenv
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_set_data.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_set_data.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_set_data.3	(revision 344549)
@@ -1,70 +1,70 @@
 .\" Generated from pam_set_data.c by gendoc.pl
 .\" $OpenPAM: pam_set_data.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SET_DATA 3
 .Os
 .Sh NAME
 .Nm pam_set_data
 .Nd set module information
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_set_data "pam_handle_t *pamh" "const char *module_data_name" "void *data" "void (*cleanup)(pam_handle_t *pamh, void *data, int pam_end_status)"
 .Sh DESCRIPTION
 The
 .Fn pam_set_data
 function associates a pointer to an opaque object
 with an arbitrary string specified by the
 .Fa module_data_name
 argument,
 in the PAM context specified by the
 .Fa pamh
 argument.
 .Pp
 If not
 .Dv NULL ,
 the
 .Fa cleanup
 argument should point to a function
 responsible for releasing the resources associated with the object.
 .Pp
 This function and its counterpart
 .Xr pam_get_data 3
 are useful for managing
 data that are meaningful only to a particular service module.
 .Sh RETURN VALUES
 The
 .Fn pam_set_data
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_get_data 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_set_data
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_set_item.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_set_item.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_set_item.3	(revision 344549)
@@ -1,62 +1,62 @@
 .\" Generated from pam_set_item.c by gendoc.pl
 .\" $OpenPAM: pam_set_item.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SET_ITEM 3
 .Os
 .Sh NAME
 .Nm pam_set_item
 .Nd set authentication information
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_set_item "pam_handle_t *pamh" "int item_type" "const void *item"
 .Sh DESCRIPTION
 The
 .Fn pam_set_item
 function sets the item specified by the
 .Fa item_type
 argument to a copy of the object pointed to by the
 .Fa item
 argument.
 The item is stored in the PAM context specified by the
 .Fa pamh
 argument.
 See
 .Xr pam_get_item 3
 for a list of recognized item types.
 .Sh RETURN VALUES
 The
 .Fn pam_set_item
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BAD_ITEM
 Unrecognized or restricted item.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_get_item 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_set_item
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_setcred.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_setcred.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_setcred.3	(revision 344549)
@@ -1,93 +1,93 @@
 .\" Generated from pam_setcred.c by gendoc.pl
 .\" $OpenPAM: pam_setcred.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SETCRED 3
 .Os
 .Sh NAME
 .Nm pam_setcred
 .Nd modify / delete user credentials for an authentication service
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_setcred "pam_handle_t *pamh" "int flags"
 .Sh DESCRIPTION
 The
 .Fn pam_setcred
 function manages the application's credentials.
 .Pp
 The
 .Fa flags
 argument is the binary or of zero or more of the following
 values:
 .Bl -tag -width 18n
 .It Dv PAM_SILENT
 Do not emit any messages.
 .It Dv PAM_ESTABLISH_CRED
 Establish the credentials of the target user.
 .It Dv PAM_DELETE_CRED
 Revoke all established credentials.
 .It Dv PAM_REINITIALIZE_CRED
 Fully reinitialise credentials.
 .It Dv PAM_REFRESH_CRED
 Refresh credentials.
 .El
 .Pp
 The latter four are mutually exclusive.
 .Pp
 If any other bits are set,
 .Fn pam_setcred
 will return
 .Dv PAM_BAD_CONSTANT .
 .Sh RETURN VALUES
 The
 .Fn pam_setcred
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_BAD_CONSTANT
 Bad constant.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_CRED_ERR
 Failed to set user credentials.
 .It Bq Er PAM_CRED_EXPIRED
 User credentials have expired.
 .It Bq Er PAM_CRED_UNAVAIL
 Failed to retrieve user credentials.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_USER_UNKNOWN
 Unknown user.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_setcred
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_setenv.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_setenv.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_setenv.3	(revision 344549)
@@ -1,59 +1,59 @@
 .\" Generated from pam_setenv.c by gendoc.pl
 .\" $OpenPAM: pam_setenv.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SETENV 3
 .Os
 .Sh NAME
 .Nm pam_setenv
 .Nd mirrors setenv(3)
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_setenv "pam_handle_t *pamh" "const char *name" "const char *value" "int overwrite"
 .Sh DESCRIPTION
 The
 .Fn pam_setenv
 function sets an environment variable.
 Its semantics are similar to those of
 .Xr setenv 3 ,
 but it modifies the PAM
 context's environment list instead of the application's.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_setenv
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_getenv 3 ,
 .Xr pam_getenvlist 3 ,
 .Xr pam_putenv 3 ,
 .Xr pam_strerror 3 ,
 .Xr setenv 3
 .Sh STANDARDS
 The
 .Fn pam_setenv
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn pam_setenv
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_sm_acct_mgmt.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_sm_acct_mgmt.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_sm_acct_mgmt.3	(revision 344549)
@@ -1,74 +1,74 @@
 .\" Generated from pam_sm_acct_mgmt.c by gendoc.pl
 .\" $OpenPAM: pam_sm_acct_mgmt.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SM_ACCT_MGMT 3
 .Os
 .Sh NAME
 .Nm pam_sm_acct_mgmt
 .Nd service module implementation for pam_acct_mgmt
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft "int"
 .Fn pam_sm_acct_mgmt "pam_handle_t *pamh" "int flags" "int argc" "const char **argv"
 .Sh DESCRIPTION
 The
 .Fn pam_sm_acct_mgmt
 function is the service module's implementation
 of the
 .Xr pam_acct_mgmt 3
 API function.
 .Sh RETURN VALUES
 The
 .Fn pam_sm_acct_mgmt
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_ACCT_EXPIRED
 User account has expired.
 .It Bq Er PAM_AUTH_ERR
 Authentication error.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_IGNORE
 Ignore this module.
 .It Bq Er PAM_NEW_AUTHTOK_REQD
 New authentication token required.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_USER_UNKNOWN
 Unknown user.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_acct_mgmt 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_sm_acct_mgmt
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_sm_authenticate.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_sm_authenticate.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_sm_authenticate.3	(revision 344549)
@@ -1,76 +1,76 @@
 .\" Generated from pam_sm_authenticate.c by gendoc.pl
 .\" $OpenPAM: pam_sm_authenticate.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SM_AUTHENTICATE 3
 .Os
 .Sh NAME
 .Nm pam_sm_authenticate
 .Nd service module implementation for pam_authenticate
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft "int"
 .Fn pam_sm_authenticate "pam_handle_t *pamh" "int flags" "int argc" "const char **argv"
 .Sh DESCRIPTION
 The
 .Fn pam_sm_authenticate
 function is the service module's
 implementation of the
 .Xr pam_authenticate 3
 API function.
 .Sh RETURN VALUES
 The
 .Fn pam_sm_authenticate
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_AUTHINFO_UNAVAIL
 Authentication information is unavailable.
 .It Bq Er PAM_AUTH_ERR
 Authentication error.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_CRED_INSUFFICIENT
 Insufficient credentials.
 .It Bq Er PAM_IGNORE
 Ignore this module.
 .It Bq Er PAM_MAXTRIES
 Maximum number of tries exceeded.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_USER_UNKNOWN
 Unknown user.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_authenticate 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_sm_authenticate
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_sm_chauthtok.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_sm_chauthtok.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_sm_chauthtok.3	(revision 344549)
@@ -1,86 +1,86 @@
 .\" Generated from pam_sm_chauthtok.c by gendoc.pl
 .\" $OpenPAM: pam_sm_chauthtok.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SM_CHAUTHTOK 3
 .Os
 .Sh NAME
 .Nm pam_sm_chauthtok
 .Nd service module implementation for pam_chauthtok
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft "int"
 .Fn pam_sm_chauthtok "pam_handle_t *pamh" "int flags" "int argc" "const char **argv"
 .Sh DESCRIPTION
 The
 .Fn pam_sm_chauthtok
 function is the service module's implementation
 of the
 .Xr pam_chauthtok 3
 API function.
 .Pp
 When the application calls
 .Xr pam_chauthtok 3 ,
 the service function is
 called twice, first with the
 .Dv PAM_PRELIM_CHECK
 flag set and then again
 with the
 .Dv PAM_UPDATE_AUTHTOK
 flag set.
 .Sh RETURN VALUES
 The
 .Fn pam_sm_chauthtok
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_AUTHTOK_DISABLE_AGING
 Authentication token aging disabled.
 .It Bq Er PAM_AUTHTOK_ERR
 Authentication token failure.
 .It Bq Er PAM_AUTHTOK_LOCK_BUSY
 Authentication token lock busy.
 .It Bq Er PAM_AUTHTOK_RECOVERY_ERR
 Failed to recover old authentication token.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_IGNORE
 Ignore this module.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_TRY_AGAIN
 Try again.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_chauthtok 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_sm_chauthtok
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_sm_close_session.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_sm_close_session.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_sm_close_session.3	(revision 344549)
@@ -1,68 +1,68 @@
 .\" Generated from pam_sm_close_session.c by gendoc.pl
 .\" $OpenPAM: pam_sm_close_session.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SM_CLOSE_SESSION 3
 .Os
 .Sh NAME
 .Nm pam_sm_close_session
 .Nd service module implementation for pam_close_session
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft "int"
 .Fn pam_sm_close_session "pam_handle_t *pamh" "int flags" "int args" "const char **argv"
 .Sh DESCRIPTION
 The
 .Fn pam_sm_close_session
 function is the service module's
 implementation of the
 .Xr pam_close_session 3
 API function.
 .Sh RETURN VALUES
 The
 .Fn pam_sm_close_session
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_IGNORE
 Ignore this module.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SESSION_ERR
 Session failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_close_session 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_sm_close_session
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_sm_open_session.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_sm_open_session.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_sm_open_session.3	(revision 344549)
@@ -1,68 +1,68 @@
 .\" Generated from pam_sm_open_session.c by gendoc.pl
 .\" $OpenPAM: pam_sm_open_session.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SM_OPEN_SESSION 3
 .Os
 .Sh NAME
 .Nm pam_sm_open_session
 .Nd service module implementation for pam_open_session
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft "int"
 .Fn pam_sm_open_session "pam_handle_t *pamh" "int flags" "int argc" "const char **argv"
 .Sh DESCRIPTION
 The
 .Fn pam_sm_open_session
 function is the service module's
 implementation of the
 .Xr pam_open_session 3
 API function.
 .Sh RETURN VALUES
 The
 .Fn pam_sm_open_session
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_IGNORE
 Ignore this module.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SESSION_ERR
 Session failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_open_session 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_sm_open_session
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_sm_setcred.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_sm_setcred.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_sm_setcred.3	(revision 344549)
@@ -1,74 +1,74 @@
 .\" Generated from pam_sm_setcred.c by gendoc.pl
 .\" $OpenPAM: pam_sm_setcred.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_SM_SETCRED 3
 .Os
 .Sh NAME
 .Nm pam_sm_setcred
 .Nd service module implementation for pam_setcred
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .In security/pam_modules.h
 .Ft "int"
 .Fn pam_sm_setcred "pam_handle_t *pamh" "int flags" "int argc" "const char **argv"
 .Sh DESCRIPTION
 The
 .Fn pam_sm_setcred
 function is the service module's implementation of
 the
 .Xr pam_setcred 3
 API function.
 .Sh RETURN VALUES
 The
 .Fn pam_sm_setcred
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_ABORT
 General failure.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_CRED_ERR
 Failed to set user credentials.
 .It Bq Er PAM_CRED_EXPIRED
 User credentials have expired.
 .It Bq Er PAM_CRED_UNAVAIL
 Failed to retrieve user credentials.
 .It Bq Er PAM_IGNORE
 Ignore this module.
 .It Bq Er PAM_PERM_DENIED
 Permission denied.
 .It Bq Er PAM_SERVICE_ERR
 Error in service module.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .It Bq Er PAM_USER_UNKNOWN
 Unknown user.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_setcred 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_sm_setcred
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_start.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_start.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_start.3	(revision 344549)
@@ -1,81 +1,81 @@
 .\" Generated from pam_start.c by gendoc.pl
 .\" $OpenPAM: pam_start.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_START 3
 .Os
 .Sh NAME
 .Nm pam_start
 .Nd initiate a PAM transaction
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_start "const char *service" "const char *user" "const struct pam_conv *pam_conv" "pam_handle_t **pamh"
 .Sh DESCRIPTION
 The
 .Fn pam_start
 function creates and initializes a PAM context.
 .Pp
 The
 .Fa service
 argument specifies the name of the policy to apply, and is
 stored in the
 .Dv PAM_SERVICE
 item in the created context.
 .Pp
 The
 .Fa user
 argument specifies the name of the target user - the user the
 created context will serve to authenticate.
 It is stored in the
 .Dv PAM_USER
 item in the created context.
 .Pp
 The
 .Fa pam_conv
 argument points to a
 .Vt struct pam_conv
 describing the
 conversation function to use; see
 .Fa pam_conv
 for details.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_start
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BAD_ITEM
 Unrecognized or restricted item.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_end 3 ,
 .Xr pam_get_item 3 ,
 .Xr pam_set_item 3 ,
 .Xr pam_strerror 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_start
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_strerror.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_strerror.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_strerror.3	(revision 344549)
@@ -1,56 +1,56 @@
 .\" Generated from pam_strerror.c by gendoc.pl
 .\" $OpenPAM: pam_strerror.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_STRERROR 3
 .Os
 .Sh NAME
 .Nm pam_strerror
 .Nd get PAM standard error message string
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "const char *"
 .Fn pam_strerror "const pam_handle_t *pamh" "int error_number"
 .Sh DESCRIPTION
 The
 .Fn pam_strerror
 function returns a pointer to a string containing a
 textual description of the error indicated by the
 .Fa error_number
 argument.
 The
 .Fa pamh
 argument is ignored.
 For compatibility with other implementations, it should be either a
 valid PAM handle returned by a previous call to
 .Xr pam_start 3 ,
 or
 .Dv NULL .
 .Sh RETURN VALUES
 The
 .Fn pam_strerror
 function returns
 .Dv NULL
 on failure.
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_start 3
 .Sh STANDARDS
 .Rs
 .%T "X/Open Single Sign-On Service (XSSO) - Pluggable Authentication Modules"
 .%D "June 1997"
 .Re
 .Sh AUTHORS
 The
 .Fn pam_strerror
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_verror.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_verror.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_verror.3	(revision 344549)
@@ -1,61 +1,61 @@
 .\" Generated from pam_verror.c by gendoc.pl
 .\" $OpenPAM: pam_verror.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_VERROR 3
 .Os
 .Sh NAME
 .Nm pam_verror
 .Nd display an error message
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_verror "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
 .Sh DESCRIPTION
 The
 .Fn pam_verror
 function passes its arguments to
 .Xr pam_vprompt 3
 with a
 style argument of
 .Dv PAM_ERROR_MSG ,
 and discards the response.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_verror
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_error 3 ,
 .Xr pam_strerror 3 ,
 .Xr pam_vinfo 3 ,
 .Xr pam_vprompt 3
 .Sh STANDARDS
 The
 .Fn pam_verror
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn pam_verror
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_vinfo.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_vinfo.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_vinfo.3	(revision 344549)
@@ -1,61 +1,61 @@
 .\" Generated from pam_vinfo.c by gendoc.pl
 .\" $OpenPAM: pam_vinfo.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_VINFO 3
 .Os
 .Sh NAME
 .Nm pam_vinfo
 .Nd display an information message
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_vinfo "const pam_handle_t *pamh" "const char *fmt" "va_list ap"
 .Sh DESCRIPTION
 The
 .Fn pam_vinfo
 function passes its arguments to
 .Xr pam_vprompt 3
 with a
 style argument of
 .Dv PAM_TEXT_INFO ,
 and discards the response.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_vinfo
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_info 3 ,
 .Xr pam_strerror 3 ,
 .Xr pam_verror 3 ,
 .Xr pam_vprompt 3
 .Sh STANDARDS
 The
 .Fn pam_vinfo
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn pam_vinfo
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/doc/man/pam_vprompt.3
===================================================================
--- projects/clang800-import/contrib/openpam/doc/man/pam_vprompt.3	(revision 344548)
+++ projects/clang800-import/contrib/openpam/doc/man/pam_vprompt.3	(revision 344549)
@@ -1,98 +1,98 @@
 .\" Generated from pam_vprompt.c by gendoc.pl
 .\" $OpenPAM: pam_vprompt.c 938 2017-04-30 21:34:42Z des $
-.Dd April 30, 2017
+.Dd February 24, 2019
 .Dt PAM_VPROMPT 3
 .Os
 .Sh NAME
 .Nm pam_vprompt
 .Nd call the conversation function
 .Sh SYNOPSIS
 .In sys/types.h
 .In security/pam_appl.h
 .Ft "int"
 .Fn pam_vprompt "const pam_handle_t *pamh" "int style" "char **resp" "const char *fmt" "va_list ap"
 .Sh DESCRIPTION
 The
 .Fn pam_vprompt
 function constructs a string from the
 .Fa fmt
 and
 .Fa ap
 arguments using
 .Xr vsnprintf 3 ,
 and passes it to the given PAM context's
 conversation function.
 .Pp
 The
 .Fa style
 argument specifies the type of interaction requested, and
 must be one of the following:
 .Bl -tag -width 18n
 .It Dv PAM_PROMPT_ECHO_OFF
 Display the message and obtain the user's response without
 displaying it.
 .It Dv PAM_PROMPT_ECHO_ON
 Display the message and obtain the user's response.
 .It Dv PAM_ERROR_MSG
 Display the message as an error message, and do not wait
 for a response.
 .It Dv PAM_TEXT_INFO
 Display the message as an informational message, and do
 not wait for a response.
 .El
 .Pp
 A pointer to the response, or
 .Dv NULL
 if the conversation function did
 not return one, is stored in the location pointed to by the
 .Fa resp
 argument.
 .Pp
 The message and response should not exceed
 .Dv PAM_MAX_MSG_SIZE
 or
 .Dv PAM_MAX_RESP_SIZE ,
 respectively.
 If they do, they may be truncated.
 .Pp
 .Sh RETURN VALUES
 The
 .Fn pam_vprompt
 function returns one of the following values:
 .Bl -tag -width 18n
 .It Bq Er PAM_SUCCESS
 Success.
 .It Bq Er PAM_BUF_ERR
 Memory buffer error.
 .It Bq Er PAM_CONV_ERR
 Conversation failure.
 .It Bq Er PAM_SYSTEM_ERR
 System error.
 .El
 .Sh SEE ALSO
 .Xr pam 3 ,
 .Xr pam_error 3 ,
 .Xr pam_info 3 ,
 .Xr pam_prompt 3 ,
 .Xr pam_strerror 3 ,
 .Xr pam_verror 3 ,
 .Xr pam_vinfo 3 ,
 .Xr vsnprintf 3
 .Sh STANDARDS
 The
 .Fn pam_vprompt
 function is an OpenPAM extension.
 .Sh AUTHORS
 The
 .Fn pam_vprompt
 function and this manual page were
 developed for the
 .Fx
 Project by ThinkSec AS and Network Associates Laboratories, the
 Security Research Division of Network Associates, Inc.\& under
 DARPA/SPAWAR contract N66001-01-C-8035
 .Pq Dq CBOSS ,
 as part of the DARPA CHATS research program.
 .Pp
 The OpenPAM library is maintained by
 .An Dag-Erling Sm\(/orgrav Aq Mt des@des.no .
Index: projects/clang800-import/contrib/openpam/include/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/include/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/include/Makefile.in	(revision 344549)
@@ -1,624 +1,631 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = include
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
 	install-exec-recursive install-html-recursive \
 	install-info-recursive install-pdf-recursive \
 	install-ps-recursive install-recursive installcheck-recursive \
 	installdirs-recursive pdf-recursive ps-recursive \
 	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
   $(RECURSIVE_TARGETS) \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
   sed_rest='s,^[^/]*/*,,'; \
   sed_last='s,^.*/\([^/]*\)$$,\1,'; \
   sed_butlast='s,/*[^/]*$$,,'; \
   while test -n "$$dir1"; do \
     first=`echo "$$dir1" | sed -e "$$sed_first"`; \
     if test "$$first" != "."; then \
       if test "$$first" = ".."; then \
         dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
         dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
       else \
         first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
         if test "$$first2" = "$$first"; then \
           dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
         else \
           dir2="../$$dir2"; \
         fi; \
         dir0="$$dir0"/"$$first"; \
       fi; \
     fi; \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = security
 all: all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign include/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
 	@fail=; \
 	if $(am__make_keepgoing); then \
 	  failcom='fail=yes'; \
 	else \
 	  failcom='exit 1'; \
 	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
 	    local_target="$$target-am"; \
 	  else \
 	    local_target="$$target"; \
 	  fi; \
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-recursive
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
 	  empty_fix=.; \
 	else \
 	  include_option=--include; \
 	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-recursive
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    $(am__make_dryrun) \
 	      || test -d "$(distdir)/$$subdir" \
 	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
 	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
 	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
 	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-recursive
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
 html: html-recursive
 
 html-am:
 
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-recursive
 
 install-html-am:
 
 install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
 install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
 
 pdf-am:
 
 ps: ps-recursive
 
 ps-am:
 
 uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic clean-libtool cscopelist-am ctags \
 	ctags-am distclean distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/include/security/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/include/security/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/include/security/Makefile.in	(revision 344549)
@@ -1,574 +1,581 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = include/security
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(security_HEADERS) \
 	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(securitydir)"
 HEADERS = $(security_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 securitydir = $(includedir)/security
 security_HEADERS = \
 	openpam.h \
 	openpam_attr.h \
 	openpam_version.h \
 	pam_appl.h \
 	pam_constants.h \
 	pam_modules.h \
 	pam_types.h
 
 all: all-am
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/security/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign include/security/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 install-securityHEADERS: $(security_HEADERS)
 	@$(NORMAL_INSTALL)
 	@list='$(security_HEADERS)'; test -n "$(securitydir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(securitydir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(securitydir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
 	done | $(am__base_list) | \
 	while read files; do \
 	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(securitydir)'"; \
 	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(securitydir)" || exit $$?; \
 	done
 
 uninstall-securityHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(security_HEADERS)'; test -n "$(securitydir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(securitydir)'; $(am__uninstall_files_from_dir)
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(securitydir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am: install-securityHEADERS
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-securityHEADERS
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libtool cscopelist-am ctags ctags-am distclean \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dvi install-dvi-am \
 	install-exec install-exec-am install-html install-html-am \
 	install-info install-info-am install-man install-pdf \
 	install-pdf-am install-ps install-ps-am \
 	install-securityHEADERS install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic \
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-securityHEADERS
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/include/security/openpam_version.h
===================================================================
--- projects/clang800-import/contrib/openpam/include/security/openpam_version.h	(revision 344548)
+++ projects/clang800-import/contrib/openpam/include/security/openpam_version.h	(revision 344549)
@@ -1,45 +1,45 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2019 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
  * Network Associates Laboratories, the Security Research Division of
  * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
  * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * 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. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
  *
- * $OpenPAM: openpam_version.h 938 2017-04-30 21:34:42Z des $
+ * $OpenPAM: openpam_version.h 945 2019-02-22 09:52:46Z des $
  */
 
 #ifndef SECURITY_OPENPAM_VERSION_H_INCLUDED
 #define SECURITY_OPENPAM_VERSION_H_INCLUDED
 
 #define OPENPAM
-#define OPENPAM_VERSION	20170430
-#define OPENPAM_RELEASE	"Resedacea"
+#define OPENPAM_VERSION	20190224
+#define OPENPAM_RELEASE	"Tabebuia"
 
 #endif /* !SECURITY_OPENPAM_VERSION_H_INCLUDED */
Index: projects/clang800-import/contrib/openpam/install-sh
===================================================================
--- projects/clang800-import/contrib/openpam/install-sh	(revision 344548)
+++ projects/clang800-import/contrib/openpam/install-sh	(revision 344549)
@@ -1,501 +1,501 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2016-01-11.22; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
 #
 # Copyright (C) 1994 X Consortium
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to
 # deal in the Software without restriction, including without limitation the
 # rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 # sell copies of the Software, and to permit persons to whom the Software is
 # furnished to do so, subject to the following conditions:
 #
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
 # tium.
 #
 #
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
 tab='	'
 nl='
 '
 IFS=" $tab$nl"
 
 # Set DOITPROG to "echo" to test this script.
 
 doit=${DOITPROG-}
 doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
 
 chgrpprog=${CHGRPPROG-chgrp}
 chmodprog=${CHMODPROG-chmod}
 chownprog=${CHOWNPROG-chown}
 cmpprog=${CMPPROG-cmp}
 cpprog=${CPPROG-cp}
 mkdirprog=${MKDIRPROG-mkdir}
 mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
 posix_mkdir=
 
 # Desired mode of installed file.
 mode=0755
 
 chgrpcmd=
 chmodcmd=$chmodprog
 chowncmd=
 mvcmd=$mvprog
 rmcmd="$rmprog -f"
 stripcmd=
 
 src=
 dst=
 dir_arg=
 dst_arg=
 
 copy_on_change=false
 is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
 
 In the 1st form, copy SRCFILE to DSTFILE.
 In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
 In the 4th, create DIRECTORIES.
 
 Options:
      --help     display this help and exit.
      --version  display version info and exit.
 
   -c            (ignored)
   -C            install only if different (preserve the last data modification time)
   -d            create directories instead of installing files.
   -g GROUP      $chgrpprog installed files to GROUP.
   -m MODE       $chmodprog installed files to MODE.
   -o USER       $chownprog installed files to USER.
   -s            $stripprog installed files.
   -t DIRECTORY  install into DIRECTORY.
   -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
   CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
   RMPROG STRIPPROG
 "
 
 while test $# -ne 0; do
   case $1 in
     -c) ;;
 
     -C) copy_on_change=true;;
 
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
         shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
         case $mode in
           *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
             echo "$0: invalid mode: $mode" >&2
             exit 1;;
         esac
         shift;;
 
     -o) chowncmd="$chownprog $2"
         shift;;
 
     -s) stripcmd=$stripprog;;
 
     -t)
         is_target_a_directory=always
         dst_arg=$2
         # Protect names problematic for 'test' and other utilities.
         case $dst_arg in
           -* | [=\(\)!]) dst_arg=./$dst_arg;;
         esac
         shift;;
 
     -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
     --) shift
         break;;
 
     -*) echo "$0: invalid option: $1" >&2
         exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
 # We allow the use of options -d and -T together, by making -d
 # take the precedence; this is for compatibility with GNU install.
 
 if test -n "$dir_arg"; then
   if test -n "$dst_arg"; then
     echo "$0: target directory not allowed when installing a directory." >&2
     exit 1
   fi
 fi
 
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
   # Otherwise, the last argument is the destination.  Remove it from $@.
   for arg
   do
     if test -n "$dst_arg"; then
       # $@ is not empty: it contains at least $arg.
       set fnord "$@" "$dst_arg"
       shift # fnord
     fi
     shift # arg
     dst_arg=$arg
     # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=\(\)!]) dst_arg=./$dst_arg;;
     esac
   done
 fi
 
 if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
   # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
   if test $# -gt 1 || test "$is_target_a_directory" = always; then
     if test ! -d "$dst_arg"; then
       echo "$0: $dst_arg: Is not a directory." >&2
       exit 1
     fi
   fi
 fi
 
 if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
   trap "ret=141; $do_exit" 13
   trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
   case $mode in
     # Optimize common cases.
     *644) cp_umask=133;;
     *755) cp_umask=22;;
 
     *[0-7])
       if test -z "$stripcmd"; then
         u_plus_rw=
       else
         u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
         u_plus_rw=
       else
         u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
 fi
 
 for src
 do
   # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
     dstdir=$dst
     test -d "$dstdir"
     dstdir_status=$?
   else
 
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
     if test ! -f "$src" && test ! -d "$src"; then
       echo "$0: $src does not exist." >&2
       exit 1
     fi
 
     if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
     dst=$dst_arg
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test "$is_target_a_directory" = never; then
         echo "$0: $dst_arg: Is a directory" >&2
         exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
       dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
   fi
 
   obsolete_mkdir_used=false
 
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
         # Create intermediate dirs using mode 755 as modified by the umask.
         # This is like FreeBSD 'install' as of 1997-10-28.
         umask=`umask`
         case $stripcmd.$umask in
           # Optimize common cases.
           *[2367][2367]) mkdir_umask=$umask;;
           .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 
           *[0-7])
             mkdir_umask=`expr $umask + 22 \
               - $umask % 100 % 40 + $umask % 20 \
               - $umask % 10 % 4 + $umask % 2
             `;;
           *) mkdir_umask=$umask,go-w;;
         esac
 
         # With -d, create the new directory with the user-specified mode.
         # Otherwise, rely on $mkdir_umask.
         if test -n "$dir_arg"; then
           mkdir_mode=-m$mode
         else
           mkdir_mode=
         fi
 
         posix_mkdir=false
         case $umask in
           *[123567][0-7][0-7])
             # POSIX mkdir -p sets u+wx bits regardless of umask, which
             # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
             ;;
           *)
             tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
             trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 
             if (umask $mkdir_umask &&
                 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
             then
               if test -z "$dir_arg" || {
                    # Check for POSIX incompatibilities with -m.
                    # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
                    # other-writable bit of parent directory when it shouldn't.
                    # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
                    ls_ld_tmpdir=`ls -ld "$tmpdir"`
                    case $ls_ld_tmpdir in
                      d????-?r-*) different_mode=700;;
                      d????-?--*) different_mode=755;;
                      *) false;;
                    esac &&
                    $mkdirprog -m$different_mode -p -- "$tmpdir" && {
                      ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
                      test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
                    }
                  }
               then posix_mkdir=:
               fi
               rmdir "$tmpdir/d" "$tmpdir"
             else
               # Remove any dirs left behind by ancient mkdir implementations.
               rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
             fi
             trap '' 0;;
         esac;;
     esac
 
     if
       $posix_mkdir && (
         umask $mkdir_umask &&
         $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
 
       # The umask is ridiculous, or mkdir does not conform to POSIX,
       # or it failed possibly due to a race condition.  Create the
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
         /*) prefix='/';;
         [-=\(\)!]*) prefix='./';;
         *)  prefix='';;
       esac
 
       oIFS=$IFS
       IFS=/
       set -f
       set fnord $dstdir
       shift
       set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
         test X"$d" = X && continue
 
         prefix=$prefix$d
         if test -d "$prefix"; then
           prefixes=
         else
           if $posix_mkdir; then
             (umask=$mkdir_umask &&
              $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
             # Don't fail if two instances are running concurrently.
             test -d "$prefix" || exit 1
           else
             case $prefix in
               *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
               *) qprefix=$prefix;;
             esac
             prefixes="$prefixes '$qprefix'"
           fi
         fi
         prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
         # Don't fail if two instances are running concurrently.
         (umask $mkdir_umask &&
          eval "\$doit_exec \$mkdirprog $prefixes") ||
           test -d "$dstdir" || exit 1
         obsolete_mkdir_used=true
       fi
     fi
   fi
 
   if test -n "$dir_arg"; then
     { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
     { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
     { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
       test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
     rmtmp=$dstdir/_rm.$$_
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 
     # Copy the file name to the temp name.
     (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
     # If any of these fail, we abort the whole thing.  If we want to
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
     { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
     { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
     { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
     { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
        old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
        new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
        set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
        set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
       rm -f "$dsttmp"
     else
       # Rename the file to the real destination.
       $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
 
       # The rename failed, perhaps because mv can't rename something else
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
         # Now remove or move aside any old file at destination location.
         # We try this two ways since rm can't unlink itself on some
         # systems and the destination file might be busy for other
         # reasons.  In this case, the final cleanup might fail but the new
         # file should still install successfully.
         {
           test ! -f "$dst" ||
           $doit $rmcmd -f "$dst" 2>/dev/null ||
           { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
             { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
           } ||
           { echo "$0: cannot unlink or rename $dst" >&2
             (exit 1); exit 1
           }
         } &&
 
         # Now rename the file to the real destination.
         $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
     trap '' 0
   fi
 done
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
Index: projects/clang800-import/contrib/openpam/lib/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/lib/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/lib/Makefile.in	(revision 344549)
@@ -1,625 +1,632 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @WITH_SYSTEM_LIBPAM_FALSE@am__append_1 = libpam
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
 	install-exec-recursive install-html-recursive \
 	install-info-recursive install-pdf-recursive \
 	install-ps-recursive install-recursive installcheck-recursive \
 	installdirs-recursive pdf-recursive ps-recursive \
 	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
   $(RECURSIVE_TARGETS) \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = libpam
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
   sed_rest='s,^[^/]*/*,,'; \
   sed_last='s,^.*/\([^/]*\)$$,\1,'; \
   sed_butlast='s,/*[^/]*$$,,'; \
   while test -n "$$dir1"; do \
     first=`echo "$$dir1" | sed -e "$$sed_first"`; \
     if test "$$first" != "."; then \
       if test "$$first" = ".."; then \
         dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
         dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
       else \
         first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
         if test "$$first2" = "$$first"; then \
           dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
         else \
           dir2="../$$dir2"; \
         fi; \
         dir0="$$dir0"/"$$first"; \
       fi; \
     fi; \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = $(am__append_1)
 all: all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign lib/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
 	@fail=; \
 	if $(am__make_keepgoing); then \
 	  failcom='fail=yes'; \
 	else \
 	  failcom='exit 1'; \
 	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
 	    local_target="$$target-am"; \
 	  else \
 	    local_target="$$target"; \
 	  fi; \
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-recursive
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
 	  empty_fix=.; \
 	else \
 	  include_option=--include; \
 	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-recursive
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    $(am__make_dryrun) \
 	      || test -d "$(distdir)/$$subdir" \
 	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
 	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
 	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
 	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-recursive
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
 html: html-recursive
 
 html-am:
 
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-recursive
 
 install-html-am:
 
 install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
 install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
 
 pdf-am:
 
 ps: ps-recursive
 
 ps-am:
 
 uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic clean-libtool cscopelist-am ctags \
 	ctags-am distclean distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/lib/libpam/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/lib/libpam/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/lib/libpam/Makefile.in	(revision 344549)
@@ -1,821 +1,983 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = lib/libpam
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
 	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libpam_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__objects_1 =
 am_libpam_la_OBJECTS = openpam_asprintf.lo openpam_borrow_cred.lo \
 	openpam_check_owner_perms.lo openpam_configure.lo \
 	openpam_constants.lo openpam_dispatch.lo openpam_dynamic.lo \
 	openpam_features.lo openpam_findenv.lo openpam_free_data.lo \
 	openpam_free_envlist.lo openpam_get_feature.lo \
 	openpam_get_option.lo openpam_load.lo openpam_log.lo \
 	openpam_nullconv.lo openpam_readline.lo openpam_readlinev.lo \
 	openpam_readword.lo openpam_restore_cred.lo \
 	openpam_set_option.lo openpam_set_feature.lo openpam_static.lo \
 	openpam_straddch.lo openpam_strlcat.lo openpam_strlcpy.lo \
 	openpam_strlset.lo openpam_subst.lo openpam_vasprintf.lo \
 	openpam_ttyconv.lo pam_acct_mgmt.lo pam_authenticate.lo \
 	pam_chauthtok.lo pam_close_session.lo pam_end.lo pam_error.lo \
 	pam_get_authtok.lo pam_get_data.lo pam_get_item.lo \
 	pam_get_user.lo pam_getenv.lo pam_getenvlist.lo pam_info.lo \
 	pam_open_session.lo pam_prompt.lo pam_putenv.lo \
 	pam_set_data.lo pam_set_item.lo pam_setcred.lo pam_setenv.lo \
 	pam_start.lo pam_strerror.lo pam_verror.lo pam_vinfo.lo \
 	pam_vprompt.lo $(am__objects_1)
 libpam_la_OBJECTS = $(am_libpam_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 libpam_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(libpam_la_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/openpam_asprintf.Plo \
+	./$(DEPDIR)/openpam_borrow_cred.Plo \
+	./$(DEPDIR)/openpam_check_owner_perms.Plo \
+	./$(DEPDIR)/openpam_configure.Plo \
+	./$(DEPDIR)/openpam_constants.Plo \
+	./$(DEPDIR)/openpam_dispatch.Plo \
+	./$(DEPDIR)/openpam_dynamic.Plo \
+	./$(DEPDIR)/openpam_features.Plo \
+	./$(DEPDIR)/openpam_findenv.Plo \
+	./$(DEPDIR)/openpam_free_data.Plo \
+	./$(DEPDIR)/openpam_free_envlist.Plo \
+	./$(DEPDIR)/openpam_get_feature.Plo \
+	./$(DEPDIR)/openpam_get_option.Plo \
+	./$(DEPDIR)/openpam_load.Plo ./$(DEPDIR)/openpam_log.Plo \
+	./$(DEPDIR)/openpam_nullconv.Plo \
+	./$(DEPDIR)/openpam_readline.Plo \
+	./$(DEPDIR)/openpam_readlinev.Plo \
+	./$(DEPDIR)/openpam_readword.Plo \
+	./$(DEPDIR)/openpam_restore_cred.Plo \
+	./$(DEPDIR)/openpam_set_feature.Plo \
+	./$(DEPDIR)/openpam_set_option.Plo \
+	./$(DEPDIR)/openpam_static.Plo \
+	./$(DEPDIR)/openpam_straddch.Plo \
+	./$(DEPDIR)/openpam_strlcat.Plo \
+	./$(DEPDIR)/openpam_strlcpy.Plo \
+	./$(DEPDIR)/openpam_strlset.Plo ./$(DEPDIR)/openpam_subst.Plo \
+	./$(DEPDIR)/openpam_ttyconv.Plo \
+	./$(DEPDIR)/openpam_vasprintf.Plo \
+	./$(DEPDIR)/pam_acct_mgmt.Plo ./$(DEPDIR)/pam_authenticate.Plo \
+	./$(DEPDIR)/pam_chauthtok.Plo \
+	./$(DEPDIR)/pam_close_session.Plo ./$(DEPDIR)/pam_end.Plo \
+	./$(DEPDIR)/pam_error.Plo ./$(DEPDIR)/pam_get_authtok.Plo \
+	./$(DEPDIR)/pam_get_data.Plo ./$(DEPDIR)/pam_get_item.Plo \
+	./$(DEPDIR)/pam_get_user.Plo ./$(DEPDIR)/pam_getenv.Plo \
+	./$(DEPDIR)/pam_getenvlist.Plo ./$(DEPDIR)/pam_info.Plo \
+	./$(DEPDIR)/pam_open_session.Plo ./$(DEPDIR)/pam_prompt.Plo \
+	./$(DEPDIR)/pam_putenv.Plo ./$(DEPDIR)/pam_set_data.Plo \
+	./$(DEPDIR)/pam_set_item.Plo ./$(DEPDIR)/pam_setcred.Plo \
+	./$(DEPDIR)/pam_setenv.Plo ./$(DEPDIR)/pam_start.Plo \
+	./$(DEPDIR)/pam_strerror.Plo ./$(DEPDIR)/pam_verror.Plo \
+	./$(DEPDIR)/pam_vinfo.Plo ./$(DEPDIR)/pam_vprompt.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libpam_la_SOURCES)
 DIST_SOURCES = $(libpam_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 HEADERS = $(noinst_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 lib_LTLIBRARIES = libpam.la
 noinst_HEADERS = \
 	openpam_asprintf.h \
 	openpam_constants.h \
 	openpam_cred.h \
 	openpam_ctype.h \
 	openpam_debug.h \
 	openpam_dlfunc.h \
 	openpam_features.h \
 	openpam_impl.h \
 	openpam_strlcat.h \
 	openpam_strlcmp.h \
 	openpam_strlcpy.h \
 	openpam_strlset.h \
 	openpam_vasprintf.h
 
 libpam_la_SOURCES = \
 	openpam_asprintf.c \
 	openpam_borrow_cred.c \
 	openpam_check_owner_perms.c \
 	openpam_configure.c \
 	openpam_constants.c \
 	openpam_dispatch.c \
 	openpam_dynamic.c \
 	openpam_features.c \
 	openpam_findenv.c \
 	openpam_free_data.c \
 	openpam_free_envlist.c \
 	openpam_get_feature.c \
 	openpam_get_option.c \
 	openpam_load.c \
 	openpam_log.c \
 	openpam_nullconv.c \
 	openpam_readline.c \
 	openpam_readlinev.c \
 	openpam_readword.c \
 	openpam_restore_cred.c \
 	openpam_set_option.c \
 	openpam_set_feature.c \
 	openpam_static.c \
 	openpam_straddch.c \
 	openpam_strlcat.c \
 	openpam_strlcpy.c \
 	openpam_strlset.c \
 	openpam_subst.c \
 	openpam_vasprintf.c \
 	openpam_ttyconv.c \
 	pam_acct_mgmt.c \
 	pam_authenticate.c \
 	pam_chauthtok.c \
 	pam_close_session.c \
 	pam_end.c \
 	pam_error.c \
 	pam_get_authtok.c \
 	pam_get_data.c \
 	pam_get_item.c \
 	pam_get_user.c \
 	pam_getenv.c \
 	pam_getenvlist.c \
 	pam_info.c \
 	pam_open_session.c \
 	pam_prompt.c \
 	pam_putenv.c \
 	pam_set_data.c \
 	pam_set_item.c \
 	pam_setcred.c \
 	pam_setenv.c \
 	pam_start.c \
 	pam_strerror.c \
 	pam_verror.c \
 	pam_vinfo.c \
 	pam_vprompt.c \
 	$(NULL)
 
 libpam_la_LDFLAGS = -no-undefined -version-info $(LIB_MAJ)
 libpam_la_LIBADD = $(DL_LIBS)
 EXTRA_DIST = \
 	pam_authenticate_secondary.c \
 	pam_get_mapped_authtok.c \
 	pam_get_mapped_username.c \
 	pam_set_mapped_authtok.c \
 	pam_set_mapped_username.c \
 	\
 	pam_sm_acct_mgmt.c \
 	pam_sm_authenticate.c \
 	pam_sm_authenticate_secondary.c \
 	pam_sm_chauthtok.c \
 	pam_sm_close_session.c \
 	pam_sm_get_mapped_authtok.c \
 	pam_sm_get_mapped_username.c \
 	pam_sm_open_session.c \
 	pam_sm_set_mapped_authtok.c \
 	pam_sm_set_mapped_username.c \
 	pam_sm_setcred.c
 
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign lib/libpam/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign lib/libpam/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
 	@list='$(lib_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
 	test -z "$$locs" || { \
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
 
 libpam.la: $(libpam_la_OBJECTS) $(libpam_la_DEPENDENCIES) $(EXTRA_libpam_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libpam_la_LINK) -rpath $(libdir) $(libpam_la_OBJECTS) $(libpam_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_asprintf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_borrow_cred.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_check_owner_perms.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_configure.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_constants.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dispatch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dynamic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_features.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_findenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_envlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_feature.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_option.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_load.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_nullconv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readlinev.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readword.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_restore_cred.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_feature.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_option.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_static.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_straddch.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcpy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_subst.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_ttyconv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_vasprintf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_acct_mgmt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_authenticate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_chauthtok.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_close_session.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_end.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_error.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_authtok.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_item.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_user.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenvlist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_open_session.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_prompt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_putenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_data.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_item.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setcred.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setenv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_start.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_strerror.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_verror.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vinfo.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vprompt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_asprintf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_borrow_cred.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_check_owner_perms.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_configure.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_constants.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dispatch.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_dynamic.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_features.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_findenv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_data.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_free_envlist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_feature.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_get_option.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_load.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_log.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_nullconv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readline.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readlinev.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_readword.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_restore_cred.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_feature.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_set_option.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_static.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_straddch.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcat.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlcpy.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_strlset.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_subst.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_ttyconv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/openpam_vasprintf.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_acct_mgmt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_authenticate.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_chauthtok.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_close_session.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_end.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_error.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_authtok.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_data.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_item.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_get_user.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_getenvlist.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_info.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_open_session.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_prompt.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_putenv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_data.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_set_item.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setcred.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_setenv.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_start.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_strerror.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_verror.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vinfo.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_vprompt.Plo@am__quote@ # am--include-marker
 
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/openpam_asprintf.Plo
+	-rm -f ./$(DEPDIR)/openpam_borrow_cred.Plo
+	-rm -f ./$(DEPDIR)/openpam_check_owner_perms.Plo
+	-rm -f ./$(DEPDIR)/openpam_configure.Plo
+	-rm -f ./$(DEPDIR)/openpam_constants.Plo
+	-rm -f ./$(DEPDIR)/openpam_dispatch.Plo
+	-rm -f ./$(DEPDIR)/openpam_dynamic.Plo
+	-rm -f ./$(DEPDIR)/openpam_features.Plo
+	-rm -f ./$(DEPDIR)/openpam_findenv.Plo
+	-rm -f ./$(DEPDIR)/openpam_free_data.Plo
+	-rm -f ./$(DEPDIR)/openpam_free_envlist.Plo
+	-rm -f ./$(DEPDIR)/openpam_get_feature.Plo
+	-rm -f ./$(DEPDIR)/openpam_get_option.Plo
+	-rm -f ./$(DEPDIR)/openpam_load.Plo
+	-rm -f ./$(DEPDIR)/openpam_log.Plo
+	-rm -f ./$(DEPDIR)/openpam_nullconv.Plo
+	-rm -f ./$(DEPDIR)/openpam_readline.Plo
+	-rm -f ./$(DEPDIR)/openpam_readlinev.Plo
+	-rm -f ./$(DEPDIR)/openpam_readword.Plo
+	-rm -f ./$(DEPDIR)/openpam_restore_cred.Plo
+	-rm -f ./$(DEPDIR)/openpam_set_feature.Plo
+	-rm -f ./$(DEPDIR)/openpam_set_option.Plo
+	-rm -f ./$(DEPDIR)/openpam_static.Plo
+	-rm -f ./$(DEPDIR)/openpam_straddch.Plo
+	-rm -f ./$(DEPDIR)/openpam_strlcat.Plo
+	-rm -f ./$(DEPDIR)/openpam_strlcpy.Plo
+	-rm -f ./$(DEPDIR)/openpam_strlset.Plo
+	-rm -f ./$(DEPDIR)/openpam_subst.Plo
+	-rm -f ./$(DEPDIR)/openpam_ttyconv.Plo
+	-rm -f ./$(DEPDIR)/openpam_vasprintf.Plo
+	-rm -f ./$(DEPDIR)/pam_acct_mgmt.Plo
+	-rm -f ./$(DEPDIR)/pam_authenticate.Plo
+	-rm -f ./$(DEPDIR)/pam_chauthtok.Plo
+	-rm -f ./$(DEPDIR)/pam_close_session.Plo
+	-rm -f ./$(DEPDIR)/pam_end.Plo
+	-rm -f ./$(DEPDIR)/pam_error.Plo
+	-rm -f ./$(DEPDIR)/pam_get_authtok.Plo
+	-rm -f ./$(DEPDIR)/pam_get_data.Plo
+	-rm -f ./$(DEPDIR)/pam_get_item.Plo
+	-rm -f ./$(DEPDIR)/pam_get_user.Plo
+	-rm -f ./$(DEPDIR)/pam_getenv.Plo
+	-rm -f ./$(DEPDIR)/pam_getenvlist.Plo
+	-rm -f ./$(DEPDIR)/pam_info.Plo
+	-rm -f ./$(DEPDIR)/pam_open_session.Plo
+	-rm -f ./$(DEPDIR)/pam_prompt.Plo
+	-rm -f ./$(DEPDIR)/pam_putenv.Plo
+	-rm -f ./$(DEPDIR)/pam_set_data.Plo
+	-rm -f ./$(DEPDIR)/pam_set_item.Plo
+	-rm -f ./$(DEPDIR)/pam_setcred.Plo
+	-rm -f ./$(DEPDIR)/pam_setenv.Plo
+	-rm -f ./$(DEPDIR)/pam_start.Plo
+	-rm -f ./$(DEPDIR)/pam_strerror.Plo
+	-rm -f ./$(DEPDIR)/pam_verror.Plo
+	-rm -f ./$(DEPDIR)/pam_vinfo.Plo
+	-rm -f ./$(DEPDIR)/pam_vprompt.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/openpam_asprintf.Plo
+	-rm -f ./$(DEPDIR)/openpam_borrow_cred.Plo
+	-rm -f ./$(DEPDIR)/openpam_check_owner_perms.Plo
+	-rm -f ./$(DEPDIR)/openpam_configure.Plo
+	-rm -f ./$(DEPDIR)/openpam_constants.Plo
+	-rm -f ./$(DEPDIR)/openpam_dispatch.Plo
+	-rm -f ./$(DEPDIR)/openpam_dynamic.Plo
+	-rm -f ./$(DEPDIR)/openpam_features.Plo
+	-rm -f ./$(DEPDIR)/openpam_findenv.Plo
+	-rm -f ./$(DEPDIR)/openpam_free_data.Plo
+	-rm -f ./$(DEPDIR)/openpam_free_envlist.Plo
+	-rm -f ./$(DEPDIR)/openpam_get_feature.Plo
+	-rm -f ./$(DEPDIR)/openpam_get_option.Plo
+	-rm -f ./$(DEPDIR)/openpam_load.Plo
+	-rm -f ./$(DEPDIR)/openpam_log.Plo
+	-rm -f ./$(DEPDIR)/openpam_nullconv.Plo
+	-rm -f ./$(DEPDIR)/openpam_readline.Plo
+	-rm -f ./$(DEPDIR)/openpam_readlinev.Plo
+	-rm -f ./$(DEPDIR)/openpam_readword.Plo
+	-rm -f ./$(DEPDIR)/openpam_restore_cred.Plo
+	-rm -f ./$(DEPDIR)/openpam_set_feature.Plo
+	-rm -f ./$(DEPDIR)/openpam_set_option.Plo
+	-rm -f ./$(DEPDIR)/openpam_static.Plo
+	-rm -f ./$(DEPDIR)/openpam_straddch.Plo
+	-rm -f ./$(DEPDIR)/openpam_strlcat.Plo
+	-rm -f ./$(DEPDIR)/openpam_strlcpy.Plo
+	-rm -f ./$(DEPDIR)/openpam_strlset.Plo
+	-rm -f ./$(DEPDIR)/openpam_subst.Plo
+	-rm -f ./$(DEPDIR)/openpam_ttyconv.Plo
+	-rm -f ./$(DEPDIR)/openpam_vasprintf.Plo
+	-rm -f ./$(DEPDIR)/pam_acct_mgmt.Plo
+	-rm -f ./$(DEPDIR)/pam_authenticate.Plo
+	-rm -f ./$(DEPDIR)/pam_chauthtok.Plo
+	-rm -f ./$(DEPDIR)/pam_close_session.Plo
+	-rm -f ./$(DEPDIR)/pam_end.Plo
+	-rm -f ./$(DEPDIR)/pam_error.Plo
+	-rm -f ./$(DEPDIR)/pam_get_authtok.Plo
+	-rm -f ./$(DEPDIR)/pam_get_data.Plo
+	-rm -f ./$(DEPDIR)/pam_get_item.Plo
+	-rm -f ./$(DEPDIR)/pam_get_user.Plo
+	-rm -f ./$(DEPDIR)/pam_getenv.Plo
+	-rm -f ./$(DEPDIR)/pam_getenvlist.Plo
+	-rm -f ./$(DEPDIR)/pam_info.Plo
+	-rm -f ./$(DEPDIR)/pam_open_session.Plo
+	-rm -f ./$(DEPDIR)/pam_prompt.Plo
+	-rm -f ./$(DEPDIR)/pam_putenv.Plo
+	-rm -f ./$(DEPDIR)/pam_set_data.Plo
+	-rm -f ./$(DEPDIR)/pam_set_item.Plo
+	-rm -f ./$(DEPDIR)/pam_setcred.Plo
+	-rm -f ./$(DEPDIR)/pam_setenv.Plo
+	-rm -f ./$(DEPDIR)/pam_start.Plo
+	-rm -f ./$(DEPDIR)/pam_strerror.Plo
+	-rm -f ./$(DEPDIR)/pam_verror.Plo
+	-rm -f ./$(DEPDIR)/pam_vinfo.Plo
+	-rm -f ./$(DEPDIR)/pam_vprompt.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-libLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
 	install-info-am install-libLTLIBRARIES install-man install-pdf \
 	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/lib/libpam/pam_getenv.c
===================================================================
--- projects/clang800-import/contrib/openpam/lib/libpam/pam_getenv.c	(revision 344548)
+++ projects/clang800-import/contrib/openpam/lib/libpam/pam_getenv.c	(revision 344549)
@@ -1,84 +1,85 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2017 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2019 Dag-Erling Smørgrav
  * All rights reserved.
  *
  * This software was developed for the FreeBSD Project by ThinkSec AS and
  * Network Associates Laboratories, the Security Research Division of
  * Network Associates, Inc.  under DARPA/SPAWAR contract N66001-01-C-8035
  * ("CBOSS"), as part of the DARPA CHATS research program.
  *
  * 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. The name of the author may not be used to endorse or promote
  *    products derived from this software without specific prior written
  *    permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
  *
- * $OpenPAM: pam_getenv.c 938 2017-04-30 21:34:42Z des $
+ * $OpenPAM: pam_getenv.c 944 2019-02-22 09:49:12Z des $
  */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <security/pam_appl.h>
 
 #include "openpam_impl.h"
 
 /*
  * XSSO 4.2.1
  * XSSO 6 page 44
  *
  * Retrieve the value of a PAM environment variable
  */
 
 const char *
 pam_getenv(pam_handle_t *pamh,
 	const char *name)
 {
-	char *str;
+	size_t len;
 	int i;
 
 	ENTERS(name);
-	if (strchr(name, '=') != NULL) {
-		errno = EINVAL;
-		RETURNS(NULL);
+	for (len = 0; name[len] != '\0'; ++len) {
+		if (name[len] == '=') {
+			errno = EINVAL;
+			RETURNS(NULL);
+		}
 	}
-	if ((i = openpam_findenv(pamh, name, strlen(name))) < 0)
+	if ((i = openpam_findenv(pamh, name, len)) < 0)
 		RETURNS(NULL);
-	if ((str = strchr(pamh->env[i], '=')) == NULL)
-		RETURNS("");
-	RETURNS(str);
+	/* assert(pamh->env[i][len] == '='); */
+	RETURNS(pamh->env[i] + len + 1);
 }
 
 /**
  * The =pam_getenv function returns the value of an environment variable.
  * Its semantics are similar to those of =getenv, but it accesses the PAM
  * context's environment list instead of the application's.
  *
  * >pam_getenvlist
  * >pam_putenv
  * >pam_setenv
  */
Index: projects/clang800-import/contrib/openpam/m4/ax_pkg_config.m4
===================================================================
--- projects/clang800-import/contrib/openpam/m4/ax_pkg_config.m4	(nonexistent)
+++ projects/clang800-import/contrib/openpam/m4/ax_pkg_config.m4	(revision 344549)
@@ -0,0 +1,157 @@
+dnl -*- autoconf -*-
+dnl
+dnl Copyright (c) 2017 The University of Oslo
+dnl All rights reserved.
+dnl
+dnl Redistribution and use in source and binary forms, with or without
+dnl modification, are permitted provided that the following conditions
+dnl are met:
+dnl 1. Redistributions of source code must retain the above copyright
+dnl    notice, this list of conditions and the following disclaimer.
+dnl 2. Redistributions in binary form must reproduce the above copyright
+dnl    notice, this list of conditions and the following disclaimer in the
+dnl    documentation and/or other materials provided with the distribution.
+dnl 3. The name of the author may not be used to endorse or promote
+dnl    products derived from this software without specific prior written
+dnl    permission.
+dnl
+dnl THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+dnl ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+dnl IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+dnl ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+dnl FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+dnl LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+dnl OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+dnl SUCH DAMAGE.
+dnl
+
+m4_define([AX_PKG_CONFIG_MACROS_VERSION], [0.20170404])
+
+dnl
+dnl AX_PROG_PKG_CONFIG([min-version])
+dnl ---------------------------------
+dnl
+dnl Verify that pkgconf or pkg-config are present.
+dnl
+AC_DEFUN([AX_PROG_PKG_CONFIG], [
+    m4_pattern_forbid([^AX_PKG_CONFIG_[A-Z_]+$])
+    AC_ARG_VAR([PKG_CONFIG], [path to pkg-config binary])
+    AC_ARG_VAR([PKG_CONFIG_PATH], [list of directories to prepend to default search path])
+    AC_ARG_VAR([PKG_CONFIG_LIBDIR], [list of directories to search instead of default search path])
+    if test x"${PKG_CONFIG}" = x"" ; then
+        AC_PATH_PROGS([PKG_CONFIG], [pkgconf pkg-config]) >/dev/null
+    else
+        AC_PATH_PROG([PKG_CONFIG], [${PKG_CONFIG}])
+    fi
+    AC_MSG_CHECKING([for pkg-config or pkgconf])
+    if test -x "${PKG_CONFIG}" ; then
+        AC_MSG_RESULT([${PKG_CONFIG}])
+        case "${PKG_CONFIG}" in
+        *pkgconf)
+            _min_version="m4_default([$1], [1.3.0])"
+            ;;
+        *pkg-config)
+            _min_version="m4_default([$1], [0.23])"
+            ;;
+        *)
+            _min_version="9.9.error"
+            ;;
+        esac
+        AC_MSG_CHECKING([that ${PKG_CONFIG} is at least version ${_min_version}])
+        _act_version=`"${PKG_CONFIG}" --version`
+        if ! "${PKG_CONFIG}" --atleast-pkgconfig-version="${_min_version}" ; then
+            PKG_CONFIG=""
+        fi
+        AC_MSG_RESULT([${_act_version}])
+    else
+        AC_MSG_RESULT([no])
+        PKG_CONFIG=""
+    fi
+    if test x"${PKG_CONFIG}" = x"" ; then
+        AC_MSG_ERROR([pkg-config was not found or is too old])
+    fi
+    AC_ARG_WITH([pkgconfigdir],
+        AS_HELP_STRING([--with-pkgconfigdir],
+	    [installation directory for .pc files @<:@LIBDIR/pkgconfig@:>@]),
+	[pkgconfigdir=$withval], [pkgconfigdir='${libdir}/pkgconfig'])
+    AC_SUBST([pkgconfigdir], [$pkgconfigdir])
+])
+
+dnl
+dnl AX_PKG_CONFIG_VAR(package-name, var-name)
+dnl -----------------------------------------
+dnl
+dnl Retrieve specific pkg-config variables for the specified package.
+dnl
+AC_DEFUN([AX_PKG_CONFIG_VAR], [
+    AC_REQUIRE([AX_PROG_PKG_CONFIG])
+    m4_define([_p], AS_TR_SH([m4_tolower([$1])]))
+    m4_case([$2],
+        [version], [ax_pc_cv_[]_p[]_version=`"${PKG_CONFIG}" --modversion [$1]`],
+        [cflags], [ax_pc_cv_[]_p[]_cflags=`"${PKG_CONFIG}" --cflags [$1]`],
+        [libs], [ax_pc_cv_[]_p[]_libs=`"${PKG_CONFIG}" --libs [$1]`],
+        [ax_pc_cv_[]_p[]_[$2]=`"${PKG_CONFIG}" --variable=[$2] [$1]`])
+])
+
+dnl
+dnl AX_PKG_CONFIG_CHECK(package-name,
+dnl     [action-if-found], [action-if-not-found])
+dnl -------------------------------------------
+dnl
+dnl Check if the specified package is installed.  If it is, define
+dnl HAVE_PACKAGE, PACKAGE_VERSION, PACKAGE_CFLAGS and PACKAGE_LIBS.
+dnl The specified actions are performed in addition to the standard
+dnl actions.
+dnl
+AC_DEFUN([AX_PKG_CONFIG_CHECK], [
+    AC_REQUIRE([AX_PROG_PKG_CONFIG])
+    m4_define([_P], AS_TR_SH([m4_toupper([$1])]))
+    m4_define([_p], AS_TR_SH([m4_tolower([$1])]))
+    AC_ARG_VAR(_P[_CFLAGS], [C compiler flags for $1])
+    AC_ARG_VAR(_P[_LIBS], [linker flags for $1])
+    AC_MSG_CHECKING([if $1 is installed])
+    if AC_RUN_LOG(["${PKG_CONFIG}" --exists --print-errors "$1"]) ; then
+        AC_MSG_RESULT([yes])
+        [ax_pc_cv_have_]_p=yes
+        AC_DEFINE([HAVE_]_P, [1], [Define to 1 if you have $1])
+dnl
+        AC_MSG_CHECKING([$1 version])
+        AX_PKG_CONFIG_VAR([$1], [version])
+        AC_SUBST(_P[_VERSION], [$ax_pc_cv_]_p[_version])
+        AC_MSG_RESULT([${ax_pc_cv_]_p[_version:-unknown}])
+dnl
+        AC_MSG_CHECKING([$1 compiler flags])
+        AX_PKG_CONFIG_VAR([$1], [cflags])
+        AC_SUBST(_P[_CFLAGS], [$ax_pc_cv_]_p[_cflags])
+        AC_MSG_RESULT([${ax_pc_cv_]_p[_cflags:-none}])
+dnl
+        AC_MSG_CHECKING([$1 linker flags])
+        AX_PKG_CONFIG_VAR([$1], [libs])
+        AC_SUBST(_P[_LIBS], [$ax_pc_cv_]_p[_libs])
+        AC_MSG_RESULT([${ax_pc_cv_]_p[_libs:-none}])
+dnl
+        m4_default([$2], [:])
+    else
+        AC_MSG_RESULT([no])
+        [ax_pc_cv_have_]_p=no
+        m4_default([$3], [:])
+    fi
+    m4_ifdef([AM_CONDITIONAL], [
+        AM_CONDITIONAL([HAVE_]_P, [test x"$ax_pc_cv_have_]_p[" = x"yes"])
+    ])
+])
+
+dnl
+dnl AX_PKG_CONFIG_REQUIRE(package-name)
+dnl -----------------------------------
+dnl
+dnl As above, but fail if the package is not installed.
+dnl
+AC_DEFUN([AX_PKG_CONFIG_REQUIRE], [
+    AX_PKG_CONFIG_CHECK([$1], [], [
+        AC_MSG_ERROR([cannot proceed without $1])
+    ])
+])
Index: projects/clang800-import/contrib/openpam/misc/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/misc/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/misc/Makefile.in	(revision 344549)
@@ -1,449 +1,456 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = misc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = coverage.sh coverity.sh
 CONFIG_CLEAN_VPATH_FILES =
 SCRIPTS = $(noinst_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/coverage.sh.in \
 	$(srcdir)/coverity.sh.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_SCRIPTS = coverage.sh coverity.sh
 all: all-am
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign misc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign misc/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 coverage.sh: $(top_builddir)/config.status $(srcdir)/coverage.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 coverity.sh: $(top_builddir)/config.status $(srcdir)/coverity.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 tags TAGS:
 
 ctags CTAGS:
 
 cscope cscopelist:
 
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(SCRIPTS)
 installdirs:
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am:
 
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
 	cscopelist-am ctags-am distclean distclean-generic \
 	distclean-libtool distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/missing
===================================================================
--- projects/clang800-import/contrib/openpam/missing	(revision 344548)
+++ projects/clang800-import/contrib/openpam/missing	(revision 344549)
@@ -1,215 +1,215 @@
 #! /bin/sh
 # Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
   echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
 case $1 in
 
   --is-lightweight)
     # Used by our autoconf macros to check whether the available missing
     # script is modern enough.
     exit 0
     ;;
 
   --run)
     # Back-compat with the calling convention used by older automake.
     shift
     ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
 Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
 to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
 
 Supported PROGRAM values:
   aclocal   autoconf  autoheader   autom4te  automake  makeinfo
   bison     yacc      flex         lex       help2man
 
 Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
 'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
     echo "missing $scriptversion (GNU Automake)"
     exit $?
     ;;
 
   -*)
     echo 1>&2 "$0: unknown '$1' option"
     echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
 # Run the given program, remember its exit status.
 "$@"; st=$?
 
 # If it succeeded, we are done.
 test $st -eq 0 && exit 0
 
 # Also exit now if we it failed (or wasn't found), and '--version' was
 # passed; such an option is passed most likely to detect whether the
 # program is present and works.
 case $2 in --version|--help) exit $st;; esac
 
 # Exit code 63 means version mismatch.  This often happens when the user
 # tries to use an ancient version of a tool on a file that requires a
 # minimum version.
 if test $st -eq 63; then
   msg="probably too old"
 elif test $st -eq 127; then
   # Program was missing.
   msg="missing on your system"
 else
   # Program was found and executed, but failed.  Give up.
   exit $st
 fi
 
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
 
 program_details ()
 {
   case $1 in
     aclocal|automake)
       echo "The '$1' program is part of the GNU Automake package:"
       echo "<$gnu_software_URL/automake>"
       echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
       echo "<$gnu_software_URL/autoconf>"
       echo "<$gnu_software_URL/m4/>"
       echo "<$perl_URL>"
       ;;
     autoconf|autom4te|autoheader)
       echo "The '$1' program is part of the GNU Autoconf package:"
       echo "<$gnu_software_URL/autoconf/>"
       echo "It also requires GNU m4 and Perl in order to run:"
       echo "<$gnu_software_URL/m4/>"
       echo "<$perl_URL>"
       ;;
   esac
 }
 
 give_advice ()
 {
   # Normalize program name to check for.
   normalized_program=`echo "$1" | sed '
     s/^gnu-//; t
     s/^gnu//; t
     s/^g//; t'`
 
   printf '%s\n' "'$1' is $msg."
 
   configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
   case $normalized_program in
     autoconf*)
       echo "You should only need it if you modified 'configure.ac',"
       echo "or m4 files included by it."
       program_details 'autoconf'
       ;;
     autoheader*)
       echo "You should only need it if you modified 'acconfig.h' or"
       echo "$configure_deps."
       program_details 'autoheader'
       ;;
     automake*)
       echo "You should only need it if you modified 'Makefile.am' or"
       echo "$configure_deps."
       program_details 'automake'
       ;;
     aclocal*)
       echo "You should only need it if you modified 'acinclude.m4' or"
       echo "$configure_deps."
       program_details 'aclocal'
       ;;
    autom4te*)
       echo "You might have modified some maintainer files that require"
       echo "the 'autom4te' program to be rebuilt."
       program_details 'autom4te'
       ;;
     bison*|yacc*)
       echo "You should only need it if you modified a '.y' file."
       echo "You may want to install the GNU Bison package:"
       echo "<$gnu_software_URL/bison/>"
       ;;
     lex*|flex*)
       echo "You should only need it if you modified a '.l' file."
       echo "You may want to install the Fast Lexical Analyzer package:"
       echo "<$flex_URL>"
       ;;
     help2man*)
       echo "You should only need it if you modified a dependency" \
            "of a man page."
       echo "You may want to install the GNU Help2man package:"
       echo "<$gnu_software_URL/help2man/>"
     ;;
     makeinfo*)
       echo "You should only need it if you modified a '.texi' file, or"
       echo "any other file indirectly affecting the aspect of the manual."
       echo "You might want to install the Texinfo package:"
       echo "<$gnu_software_URL/texinfo/>"
       echo "The spurious makeinfo call might also be the consequence of"
       echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
       echo "want to install GNU make:"
       echo "<$gnu_software_URL/make/>"
       ;;
     *)
       echo "You might have modified some files without having the proper"
       echo "tools for further handling them.  Check the 'README' file, it"
       echo "often tells you about the needed prerequisites for installing"
       echo "this package.  You may also peek at any GNU archive site, in"
       echo "case some other package contains this missing '$1' program."
       ;;
   esac
 }
 
 give_advice "$1" | sed -e '1s/^/WARNING: /' \
                        -e '2,$s/^/         /' >&2
 
 # Propagate the correct exit status (expected to be 127 for a program
 # not found, 63 for a program that failed due to version mismatch).
 exit $st
 
 # Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
Index: projects/clang800-import/contrib/openpam/modules/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/modules/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/modules/Makefile.in	(revision 344549)
@@ -1,625 +1,632 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @WITH_PAM_UNIX_TRUE@am__append_1 = pam_unix
 subdir = modules
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
 	ctags-recursive dvi-recursive html-recursive info-recursive \
 	install-data-recursive install-dvi-recursive \
 	install-exec-recursive install-html-recursive \
 	install-info-recursive install-pdf-recursive \
 	install-ps-recursive install-recursive installcheck-recursive \
 	installdirs-recursive pdf-recursive ps-recursive \
 	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 am__recursive_targets = \
   $(RECURSIVE_TARGETS) \
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = pam_deny pam_permit pam_return pam_unix
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
   sed_rest='s,^[^/]*/*,,'; \
   sed_last='s,^.*/\([^/]*\)$$,\1,'; \
   sed_butlast='s,/*[^/]*$$,,'; \
   while test -n "$$dir1"; do \
     first=`echo "$$dir1" | sed -e "$$sed_first"`; \
     if test "$$first" != "."; then \
       if test "$$first" = ".."; then \
         dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
         dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
       else \
         first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
         if test "$$first2" = "$$first"; then \
           dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
         else \
           dir2="../$$dir2"; \
         fi; \
         dir0="$$dir0"/"$$first"; \
       fi; \
     fi; \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = pam_deny pam_permit pam_return $(am__append_1)
 all: all-recursive
 
 .SUFFIXES:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign modules/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run 'make' without going through this Makefile.
 # To change the values of 'make' variables: instead of editing Makefiles,
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
 $(am__recursive_targets):
 	@fail=; \
 	if $(am__make_keepgoing); then \
 	  failcom='fail=yes'; \
 	else \
 	  failcom='exit 1'; \
 	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
 	  *) list='$(SUBDIRS)' ;; \
 	esac; \
 	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
 	    local_target="$$target-am"; \
 	  else \
 	    local_target="$$target"; \
 	  fi; \
 	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-recursive
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
 	  empty_fix=.; \
 	else \
 	  include_option=--include; \
 	  empty_fix=; \
 	fi; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-recursive
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    $(am__make_dryrun) \
 	      || test -d "$(distdir)/$$subdir" \
 	      || $(MKDIR_P) "$(distdir)/$$subdir" \
 	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
 	    dir1=$$subdir; dir2="$(top_distdir)"; \
 	    $(am__relativize); \
 	    new_top_distdir=$$reldir; \
 	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
 	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
 	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
 	        top_distdir="$$new_top_distdir" \
 	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
 		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-recursive
 all-am: Makefile
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
 uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
 
 dvi-am:
 
 html: html-recursive
 
 html-am:
 
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-recursive
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-recursive
 
 install-html-am:
 
 install-info: install-info-recursive
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-recursive
 
 install-pdf-am:
 
 install-ps: install-ps-recursive
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-recursive
 
 pdf-am:
 
 ps: ps-recursive
 
 ps-am:
 
 uninstall-am:
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
 	check-am clean clean-generic clean-libtool cscopelist-am ctags \
 	ctags-am distclean distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
 	install-html-am install-info install-info-am install-man \
 	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/modules/pam_deny/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/modules/pam_deny/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/modules/pam_deny/Makefile.in	(revision 344549)
@@ -1,661 +1,676 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/pam_deny
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(moduledir)"
 LTLIBRARIES = $(module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @WITH_SYSTEM_LIBPAM_FALSE@pam_deny_la_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@pam_deny_la_DEPENDENCIES =  \
 @WITH_SYSTEM_LIBPAM_TRUE@	$(am__DEPENDENCIES_1)
 am_pam_deny_la_OBJECTS = pam_deny.lo
 pam_deny_la_OBJECTS = $(am_pam_deny_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 pam_deny_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(pam_deny_la_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pam_deny.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(pam_deny_la_SOURCES)
 DIST_SOURCES = $(pam_deny_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @CUSTOM_MODULES_DIR_FALSE@moduledir = $(libdir)
 @CUSTOM_MODULES_DIR_TRUE@moduledir = $(OPENPAM_MODULES_DIR)
 AM_CPPFLAGS = -I$(top_srcdir)/include
 module_LTLIBRARIES = pam_deny.la
 pam_deny_la_SOURCES = pam_deny.c
 pam_deny_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
 	-export-symbols-regex '^pam_sm_'
 
 @WITH_SYSTEM_LIBPAM_FALSE@pam_deny_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@pam_deny_la_LIBADD = $(SYSTEM_LIBPAM)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/pam_deny/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign modules/pam_deny/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
 	}
 
 uninstall-moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$f'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$f"; \
 	done
 
 clean-moduleLTLIBRARIES:
 	-test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
 	@list='$(module_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
 	test -z "$$locs" || { \
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
 
 pam_deny.la: $(pam_deny_la_OBJECTS) $(pam_deny_la_DEPENDENCIES) $(EXTRA_pam_deny_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(pam_deny_la_LINK) -rpath $(moduledir) $(pam_deny_la_OBJECTS) $(pam_deny_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_deny.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_deny.Plo@am__quote@ # am--include-marker
 
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(moduledir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pam_deny.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am: install-moduleLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pam_deny.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-moduleLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-moduleLTLIBRARIES \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-moduleLTLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man \
+	install-moduleLTLIBRARIES install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/modules/pam_permit/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/modules/pam_permit/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/modules/pam_permit/Makefile.in	(revision 344549)
@@ -1,661 +1,676 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/pam_permit
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(moduledir)"
 LTLIBRARIES = $(module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @WITH_SYSTEM_LIBPAM_FALSE@pam_permit_la_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@pam_permit_la_DEPENDENCIES =  \
 @WITH_SYSTEM_LIBPAM_TRUE@	$(am__DEPENDENCIES_1)
 am_pam_permit_la_OBJECTS = pam_permit.lo
 pam_permit_la_OBJECTS = $(am_pam_permit_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 pam_permit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(pam_permit_la_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pam_permit.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(pam_permit_la_SOURCES)
 DIST_SOURCES = $(pam_permit_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @CUSTOM_MODULES_DIR_FALSE@moduledir = $(libdir)
 @CUSTOM_MODULES_DIR_TRUE@moduledir = $(OPENPAM_MODULES_DIR)
 AM_CPPFLAGS = -I$(top_srcdir)/include
 module_LTLIBRARIES = pam_permit.la
 pam_permit_la_SOURCES = pam_permit.c
 pam_permit_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
 	-export-symbols-regex '^pam_sm_'
 
 @WITH_SYSTEM_LIBPAM_FALSE@pam_permit_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@pam_permit_la_LIBADD = $(SYSTEM_LIBPAM)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/pam_permit/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign modules/pam_permit/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
 	}
 
 uninstall-moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$f'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$f"; \
 	done
 
 clean-moduleLTLIBRARIES:
 	-test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
 	@list='$(module_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
 	test -z "$$locs" || { \
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
 
 pam_permit.la: $(pam_permit_la_OBJECTS) $(pam_permit_la_DEPENDENCIES) $(EXTRA_pam_permit_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(pam_permit_la_LINK) -rpath $(moduledir) $(pam_permit_la_OBJECTS) $(pam_permit_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_permit.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_permit.Plo@am__quote@ # am--include-marker
 
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(moduledir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pam_permit.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am: install-moduleLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pam_permit.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-moduleLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-moduleLTLIBRARIES \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-moduleLTLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man \
+	install-moduleLTLIBRARIES install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/modules/pam_return/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/modules/pam_return/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/modules/pam_return/Makefile.in	(revision 344549)
@@ -1,661 +1,676 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/pam_return
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(moduledir)"
 LTLIBRARIES = $(module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 @WITH_SYSTEM_LIBPAM_FALSE@pam_return_la_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@pam_return_la_DEPENDENCIES =  \
 @WITH_SYSTEM_LIBPAM_TRUE@	$(am__DEPENDENCIES_1)
 am_pam_return_la_OBJECTS = pam_return.lo
 pam_return_la_OBJECTS = $(am_pam_return_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 pam_return_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(pam_return_la_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pam_return.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(pam_return_la_SOURCES)
 DIST_SOURCES = $(pam_return_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @CUSTOM_MODULES_DIR_FALSE@moduledir = $(libdir)
 @CUSTOM_MODULES_DIR_TRUE@moduledir = $(OPENPAM_MODULES_DIR)
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
 module_LTLIBRARIES = pam_return.la
 pam_return_la_SOURCES = pam_return.c
 pam_return_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
 	-export-symbols-regex '^pam_sm_'
 
 @WITH_SYSTEM_LIBPAM_FALSE@pam_return_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@pam_return_la_LIBADD = $(SYSTEM_LIBPAM)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/pam_return/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign modules/pam_return/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
 	}
 
 uninstall-moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$f'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$f"; \
 	done
 
 clean-moduleLTLIBRARIES:
 	-test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
 	@list='$(module_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
 	test -z "$$locs" || { \
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
 
 pam_return.la: $(pam_return_la_OBJECTS) $(pam_return_la_DEPENDENCIES) $(EXTRA_pam_return_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(pam_return_la_LINK) -rpath $(moduledir) $(pam_return_la_OBJECTS) $(pam_return_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_return.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_return.Plo@am__quote@ # am--include-marker
 
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(moduledir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pam_return.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am: install-moduleLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pam_return.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-moduleLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-moduleLTLIBRARIES \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-moduleLTLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man \
+	install-moduleLTLIBRARIES install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/modules/pam_unix/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/modules/pam_unix/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/modules/pam_unix/Makefile.in	(revision 344549)
@@ -1,662 +1,676 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
 # $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = modules/pam_unix
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(moduledir)"
 LTLIBRARIES = $(module_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-@WITH_SYSTEM_LIBPAM_FALSE@pam_unix_la_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la \
-@WITH_SYSTEM_LIBPAM_FALSE@	$(am__DEPENDENCIES_1)
+@WITH_SYSTEM_LIBPAM_FALSE@pam_unix_la_DEPENDENCIES = $(top_builddir)/lib/libpam/libpam.la
 @WITH_SYSTEM_LIBPAM_TRUE@pam_unix_la_DEPENDENCIES =  \
 @WITH_SYSTEM_LIBPAM_TRUE@	$(am__DEPENDENCIES_1)
 am_pam_unix_la_OBJECTS = pam_unix.lo
 pam_unix_la_OBJECTS = $(am_pam_unix_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 pam_unix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(pam_unix_la_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/pam_unix.Plo
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(pam_unix_la_SOURCES)
 DIST_SOURCES = $(pam_unix_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 @CUSTOM_MODULES_DIR_FALSE@moduledir = $(libdir)
 @CUSTOM_MODULES_DIR_TRUE@moduledir = $(OPENPAM_MODULES_DIR)
 AM_CPPFLAGS = -I$(top_srcdir)/include
 module_LTLIBRARIES = pam_unix.la
 pam_unix_la_SOURCES = pam_unix.c
 pam_unix_la_LDFLAGS = -no-undefined -module -version-info $(LIB_MAJ) \
 	-export-symbols-regex '^pam_sm_'
 
 @WITH_SYSTEM_LIBPAM_FALSE@pam_unix_la_LIBADD = $(top_builddir)/lib/libpam/libpam.la $(CRYPT_LIBS)
 @WITH_SYSTEM_LIBPAM_TRUE@pam_unix_la_LIBADD = $(SYSTEM_LIBPAM)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign modules/pam_unix/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign modules/pam_unix/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
 install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
 	    list2="$$list2 $$p"; \
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(moduledir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(moduledir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(moduledir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(moduledir)"; \
 	}
 
 uninstall-moduleLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
 	@list='$(module_LTLIBRARIES)'; test -n "$(moduledir)" || list=; \
 	for p in $$list; do \
 	  $(am__strip_dir) \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(moduledir)/$$f'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(moduledir)/$$f"; \
 	done
 
 clean-moduleLTLIBRARIES:
 	-test -z "$(module_LTLIBRARIES)" || rm -f $(module_LTLIBRARIES)
 	@list='$(module_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
 	test -z "$$locs" || { \
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
 
 pam_unix.la: $(pam_unix_la_OBJECTS) $(pam_unix_la_DEPENDENCIES) $(EXTRA_pam_unix_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(pam_unix_la_LINK) -rpath $(moduledir) $(pam_unix_la_OBJECTS) $(pam_unix_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pam_unix.Plo@am__quote@ # am--include-marker
 
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
 	for dir in "$(DESTDIR)$(moduledir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-moduleLTLIBRARIES \
 	mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pam_unix.Plo
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am: install-moduleLTLIBRARIES
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/pam_unix.Plo
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am: uninstall-moduleLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-moduleLTLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-moduleLTLIBRARIES \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-moduleLTLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man \
+	install-moduleLTLIBRARIES install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am \
 	uninstall-moduleLTLIBRARIES
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/t/Makefile.am
===================================================================
--- projects/clang800-import/contrib/openpam/t/Makefile.am	(revision 344548)
+++ projects/clang800-import/contrib/openpam/t/Makefile.am	(revision 344549)
@@ -1,32 +1,33 @@
-# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
+# $OpenPAM: Makefile.am 943 2019-02-20 13:23:51Z des $
 
 if WITH_TEST
 
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam \
+	$(CRYB_TEST_CFLAGS)
 
 AM_TESTS_ENVIRONMENT = \
 	PAM_RETURN_SO=$(abs_top_builddir)/modules/pam_return/.libs/pam_return.so
 
-noinst_HEADERS = t_pam_conv.h
-
 # tests
 TESTS =
 TESTS += t_openpam_ctype
 TESTS += t_openpam_dispatch
 TESTS += t_openpam_readword
 TESTS += t_openpam_readlinev
+TESTS += t_pam_env
 check_PROGRAMS = $(TESTS)
 
 # libt - common support code
 check_LIBRARIES = libt.a
-libt_a_SOURCES = t_pam_conv.c
+libt_a_SOURCES = t_pam_conv.c t_pam_err.c
+noinst_HEADERS = t_pam_conv.h t_pam_err.h
 
 # link with libpam and test framework
 LDADD = $(CRYB_TEST_LIBS) libt.a
 if WITH_SYSTEM_LIBPAM
 LDADD += $(SYSTEM_LIBPAM)
 else
 LDADD += $(top_builddir)/lib/libpam/libpam.la
 endif
 
 endif
Index: projects/clang800-import/contrib/openpam/t/Makefile.in
===================================================================
--- projects/clang800-import/contrib/openpam/t/Makefile.in	(revision 344548)
+++ projects/clang800-import/contrib/openpam/t/Makefile.in	(revision 344549)
@@ -1,1068 +1,1121 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
 
-# $OpenPAM: Makefile.am 938 2017-04-30 21:34:42Z des $
+# $OpenPAM: Makefile.am 943 2019-02-20 13:23:51Z des $
 
 VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
   elif test -n '$(MAKE_HOST)'; then \
     true; \
   elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     true; \
   else \
     false; \
   fi; \
 }
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
       *) echo "am__make_running_with_option: internal error: invalid" \
               "target option '$${target_option-}' specified" >&2; \
          exit 1;; \
   esac; \
   has_opt=no; \
   sane_makeflags=$$MAKEFLAGS; \
   if $(am__is_gnu_make); then \
     sane_makeflags=$$MFLAGS; \
   else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
         bs=\\; \
         sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
           | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
   fi; \
   skip_next=no; \
   strip_trailopt () \
   { \
     flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
   }; \
   for flg in $$sane_makeflags; do \
     test $$skip_next = yes && { skip_next=no; continue; }; \
     case $$flg in \
       *=*|--*) continue;; \
         -*I) strip_trailopt 'I'; skip_next=yes;; \
       -*I?*) strip_trailopt 'I';; \
         -*O) strip_trailopt 'O'; skip_next=yes;; \
       -*O?*) strip_trailopt 'O';; \
         -*l) strip_trailopt 'l'; skip_next=yes;; \
       -*l?*) strip_trailopt 'l';; \
       -[dEDm]) skip_next=yes;; \
       -[JT]) skip_next=yes;; \
     esac; \
     case $$flg in \
       *$$target_option*) has_opt=yes; break;; \
     esac; \
   done; \
   test $$has_opt = yes
 am__make_dryrun = (target_option=n; $(am__make_running_with_option))
 am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @WITH_TEST_TRUE@TESTS = t_openpam_ctype$(EXEEXT) \
 @WITH_TEST_TRUE@	t_openpam_dispatch$(EXEEXT) \
 @WITH_TEST_TRUE@	t_openpam_readword$(EXEEXT) \
-@WITH_TEST_TRUE@	t_openpam_readlinev$(EXEEXT)
+@WITH_TEST_TRUE@	t_openpam_readlinev$(EXEEXT) \
+@WITH_TEST_TRUE@	t_pam_env$(EXEEXT)
 @WITH_TEST_TRUE@check_PROGRAMS = $(am__EXEEXT_1)
 @WITH_SYSTEM_LIBPAM_TRUE@@WITH_TEST_TRUE@am__append_1 = $(SYSTEM_LIBPAM)
 @WITH_SYSTEM_LIBPAM_FALSE@@WITH_TEST_TRUE@am__append_2 = $(top_builddir)/lib/libpam/libpam.la
 subdir = t
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pkg_config.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \
 	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+@WITH_TEST_TRUE@am__EXEEXT_1 = t_openpam_ctype$(EXEEXT) \
+@WITH_TEST_TRUE@	t_openpam_dispatch$(EXEEXT) \
+@WITH_TEST_TRUE@	t_openpam_readword$(EXEEXT) \
+@WITH_TEST_TRUE@	t_openpam_readlinev$(EXEEXT) \
+@WITH_TEST_TRUE@	t_pam_env$(EXEEXT)
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
 am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
 am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
 libt_a_AR = $(AR) $(ARFLAGS)
 libt_a_LIBADD =
-am__libt_a_SOURCES_DIST = t_pam_conv.c
-@WITH_TEST_TRUE@am_libt_a_OBJECTS = t_pam_conv.$(OBJEXT)
+am__libt_a_SOURCES_DIST = t_pam_conv.c t_pam_err.c
+@WITH_TEST_TRUE@am_libt_a_OBJECTS = t_pam_conv.$(OBJEXT) \
+@WITH_TEST_TRUE@	t_pam_err.$(OBJEXT)
 libt_a_OBJECTS = $(am_libt_a_OBJECTS)
-@WITH_TEST_TRUE@am__EXEEXT_1 = t_openpam_ctype$(EXEEXT) \
-@WITH_TEST_TRUE@	t_openpam_dispatch$(EXEEXT) \
-@WITH_TEST_TRUE@	t_openpam_readword$(EXEEXT) \
-@WITH_TEST_TRUE@	t_openpam_readlinev$(EXEEXT)
 t_openpam_ctype_SOURCES = t_openpam_ctype.c
 t_openpam_ctype_OBJECTS = t_openpam_ctype.$(OBJEXT)
 t_openpam_ctype_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 @WITH_SYSTEM_LIBPAM_TRUE@@WITH_TEST_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 @WITH_TEST_TRUE@t_openpam_ctype_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 @WITH_TEST_TRUE@	libt.a $(am__DEPENDENCIES_2) $(am__append_2)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 t_openpam_dispatch_SOURCES = t_openpam_dispatch.c
 t_openpam_dispatch_OBJECTS = t_openpam_dispatch.$(OBJEXT)
 t_openpam_dispatch_LDADD = $(LDADD)
 @WITH_TEST_TRUE@t_openpam_dispatch_DEPENDENCIES =  \
 @WITH_TEST_TRUE@	$(am__DEPENDENCIES_1) libt.a \
 @WITH_TEST_TRUE@	$(am__DEPENDENCIES_2) $(am__append_2)
 t_openpam_readlinev_SOURCES = t_openpam_readlinev.c
 t_openpam_readlinev_OBJECTS = t_openpam_readlinev.$(OBJEXT)
 t_openpam_readlinev_LDADD = $(LDADD)
 @WITH_TEST_TRUE@t_openpam_readlinev_DEPENDENCIES =  \
 @WITH_TEST_TRUE@	$(am__DEPENDENCIES_1) libt.a \
 @WITH_TEST_TRUE@	$(am__DEPENDENCIES_2) $(am__append_2)
 t_openpam_readword_SOURCES = t_openpam_readword.c
 t_openpam_readword_OBJECTS = t_openpam_readword.$(OBJEXT)
 t_openpam_readword_LDADD = $(LDADD)
 @WITH_TEST_TRUE@t_openpam_readword_DEPENDENCIES =  \
 @WITH_TEST_TRUE@	$(am__DEPENDENCIES_1) libt.a \
 @WITH_TEST_TRUE@	$(am__DEPENDENCIES_2) $(am__append_2)
+t_pam_env_SOURCES = t_pam_env.c
+t_pam_env_OBJECTS = t_pam_env.$(OBJEXT)
+t_pam_env_LDADD = $(LDADD)
+@WITH_TEST_TRUE@t_pam_env_DEPENDENCIES = $(am__DEPENDENCIES_1) libt.a \
+@WITH_TEST_TRUE@	$(am__DEPENDENCIES_2) $(am__append_2)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
 am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN     " $@;
 am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/t_openpam_ctype.Po \
+	./$(DEPDIR)/t_openpam_dispatch.Po \
+	./$(DEPDIR)/t_openpam_readlinev.Po \
+	./$(DEPDIR)/t_openpam_readword.Po ./$(DEPDIR)/t_pam_conv.Po \
+	./$(DEPDIR)/t_pam_env.Po ./$(DEPDIR)/t_pam_err.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
 am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libt_a_SOURCES) t_openpam_ctype.c t_openpam_dispatch.c \
-	t_openpam_readlinev.c t_openpam_readword.c
+	t_openpam_readlinev.c t_openpam_readword.c t_pam_env.c
 DIST_SOURCES = $(am__libt_a_SOURCES_DIST) t_openpam_ctype.c \
 	t_openpam_dispatch.c t_openpam_readlinev.c \
-	t_openpam_readword.c
+	t_openpam_readword.c t_pam_env.c
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
-am__noinst_HEADERS_DIST = t_pam_conv.h
+am__noinst_HEADERS_DIST = t_pam_conv.h t_pam_err.h
 HEADERS = $(noinst_HEADERS)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
 am__uniquify_input = $(AWK) '\
   BEGIN { nonempty = 0; } \
   { items[$$0] = 1; nonempty = 1; } \
   END { if (nonempty) { for (i in items) print i; }; } \
 '
 # Make sure the list of sources is unique.  This is necessary because,
 # e.g., the same source file might be shared among _SOURCES variables
 # for different programs/libraries.
 am__define_uniq_tagged_files = \
   list='$(am__tagged_files)'; \
   unique=`for i in $$list; do \
     if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors_dummy = \
   mgn= red= grn= lgn= blu= brg= std=; \
   am__color_tests=no
 am__tty_colors = { \
   $(am__tty_colors_dummy); \
   if test "X$(AM_COLOR_TESTS)" = Xno; then \
     am__color_tests=no; \
   elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
     am__color_tests=yes; \
   elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
     am__color_tests=yes; \
   fi; \
   if test $$am__color_tests = yes; then \
     red=''; \
     grn=''; \
     lgn=''; \
     blu=''; \
     mgn=''; \
     brg=''; \
     std=''; \
   fi; \
 }
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
 am__install_max = 40
 am__nobase_strip_setup = \
   srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
 am__nobase_strip = \
   for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
 am__nobase_list = $(am__nobase_strip_setup); \
   for p in $$list; do echo "$$p $$p"; done | \
   sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
   $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
     if (++n[$$2] == $(am__install_max)) \
       { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
     END { for (dir in files) print dir, files[dir] }'
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__uninstall_files_from_dir = { \
   test -z "$$files" \
     || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__recheck_rx = ^[ 	]*:recheck:[ 	]*
 am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*
 am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*
 # A command that, given a newline-separated list of test names on the
 # standard input, print the name of the tests that are to be re-run
 # upon "make recheck".
 am__list_recheck_tests = $(AWK) '{ \
   recheck = 1; \
   while ((rc = (getline line < ($$0 ".trs"))) != 0) \
     { \
       if (rc < 0) \
         { \
           if ((getline line2 < ($$0 ".log")) < 0) \
 	    recheck = 0; \
           break; \
         } \
       else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
         { \
           recheck = 0; \
           break; \
         } \
       else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
         { \
           break; \
         } \
     }; \
   if (recheck) \
     print $$0; \
   close ($$0 ".trs"); \
   close ($$0 ".log"); \
 }'
 # A command that, given a newline-separated list of test names on the
 # standard input, create the global log from their .trs and .log files.
 am__create_global_log = $(AWK) ' \
 function fatal(msg) \
 { \
   print "fatal: making $@: " msg | "cat >&2"; \
   exit 1; \
 } \
 function rst_section(header) \
 { \
   print header; \
   len = length(header); \
   for (i = 1; i <= len; i = i + 1) \
     printf "="; \
   printf "\n\n"; \
 } \
 { \
   copy_in_global_log = 1; \
   global_test_result = "RUN"; \
   while ((rc = (getline line < ($$0 ".trs"))) != 0) \
     { \
       if (rc < 0) \
          fatal("failed to read from " $$0 ".trs"); \
       if (line ~ /$(am__global_test_result_rx)/) \
         { \
           sub("$(am__global_test_result_rx)", "", line); \
           sub("[ 	]*$$", "", line); \
           global_test_result = line; \
         } \
       else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
         copy_in_global_log = 0; \
     }; \
   if (copy_in_global_log) \
     { \
       rst_section(global_test_result ": " $$0); \
       while ((rc = (getline line < ($$0 ".log"))) != 0) \
       { \
         if (rc < 0) \
           fatal("failed to read from " $$0 ".log"); \
         print line; \
       }; \
       printf "\n"; \
     }; \
   close ($$0 ".trs"); \
   close ($$0 ".log"); \
 }'
 # Restructured Text title.
 am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
 # Solaris 10 'make', and several other traditional 'make' implementations,
 # pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it
 # by disabling -e (using the XSI extension "set +e") if it's set.
 am__sh_e_setup = case $$- in *e*) set +e;; esac
 # Default flags passed to test drivers.
 am__common_driver_flags = \
   --color-tests "$$am__color_tests" \
   --enable-hard-errors "$$am__enable_hard_errors" \
   --expect-failure "$$am__expect_failure"
 # To be inserted before the command running the test.  Creates the
 # directory for the log if needed.  Stores in $dir the directory
 # containing $f, in $tst the test, in $log the log.  Executes the
 # developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
 # passes TESTS_ENVIRONMENT.  Set up options for the wrapper that
 # will run the test scripts (or their associated LOG_COMPILER, if
 # thy have one).
 am__check_pre = \
 $(am__sh_e_setup);					\
 $(am__vpath_adj_setup) $(am__vpath_adj)			\
 $(am__tty_colors);					\
 srcdir=$(srcdir); export srcdir;			\
 case "$@" in						\
   */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\
     *) am__odir=.;; 					\
 esac;							\
 test "x$$am__odir" = x"." || test -d "$$am__odir" 	\
   || $(MKDIR_P) "$$am__odir" || exit $$?;		\
 if test -f "./$$f"; then dir=./;			\
 elif test -f "$$f"; then dir=;				\
 else dir="$(srcdir)/"; fi;				\
 tst=$$dir$$f; log='$@'; 				\
 if test -n '$(DISABLE_HARD_ERRORS)'; then		\
   am__enable_hard_errors=no; 				\
 else							\
   am__enable_hard_errors=yes; 				\
 fi; 							\
 case " $(XFAIL_TESTS) " in				\
   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
     am__expect_failure=yes;;				\
   *)							\
     am__expect_failure=no;;				\
 esac; 							\
 $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
 # A shell command to get the names of the tests scripts with any registered
 # extension removed (i.e., equivalently, the names of the test logs, with
 # the '.log' extension removed).  The result is saved in the shell variable
 # '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,
 # we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
 # since that might cause problem with VPATH rewrites for suffix-less tests.
 # See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
 am__set_TESTS_bases = \
   bases='$(TEST_LOGS)'; \
   bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
   bases=`echo $$bases`
 RECHECK_LOGS = $(TEST_LOGS)
 AM_RECURSIVE_TARGETS = check recheck
 TEST_SUITE_LOG = test-suite.log
 TEST_EXTENSIONS = @EXEEXT@ .test
 LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
 LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
 am__set_b = \
   case '$@' in \
     */*) \
       case '$*' in \
         */*) b='$*';; \
           *) b=`echo '$@' | sed 's/\.log$$//'`; \
        esac;; \
     *) \
       b='$*';; \
   esac
 am__test_logs1 = $(TESTS:=.log)
 am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log)
 TEST_LOGS = $(am__test_logs2:.test.log=.log)
 TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \
 	$(top_srcdir)/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CRYB_TEST_CFLAGS = @CRYB_TEST_CFLAGS@
 CRYB_TEST_LIBS = @CRYB_TEST_LIBS@
-CRYPTO_LIBS = @CRYPTO_LIBS@
-CRYPT_LIBS = @CRYPT_LIBS@
+CRYB_TEST_VERSION = @CRYB_TEST_VERSION@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DL_LIBS = @DL_LIBS@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIB_MAJ = @LIB_MAJ@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 OPENPAM_MODULES_DIR = @OPENPAM_MODULES_DIR@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SYSTEM_LIBPAM = @SYSTEM_LIBPAM@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
+pkgconfigdir = @pkgconfigdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-@WITH_TEST_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam
+@WITH_TEST_TRUE@AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/libpam \
+@WITH_TEST_TRUE@	$(CRYB_TEST_CFLAGS)
+
 @WITH_TEST_TRUE@AM_TESTS_ENVIRONMENT = \
 @WITH_TEST_TRUE@	PAM_RETURN_SO=$(abs_top_builddir)/modules/pam_return/.libs/pam_return.so
 
-@WITH_TEST_TRUE@noinst_HEADERS = t_pam_conv.h
 
 # libt - common support code
 @WITH_TEST_TRUE@check_LIBRARIES = libt.a
-@WITH_TEST_TRUE@libt_a_SOURCES = t_pam_conv.c
+@WITH_TEST_TRUE@libt_a_SOURCES = t_pam_conv.c t_pam_err.c
+@WITH_TEST_TRUE@noinst_HEADERS = t_pam_conv.h t_pam_err.h
 
 # link with libpam and test framework
 @WITH_TEST_TRUE@LDADD = $(CRYB_TEST_LIBS) libt.a $(am__append_1) \
 @WITH_TEST_TRUE@	$(am__append_2)
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
 	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
 	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign t/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign t/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 $(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
-clean-checkLIBRARIES:
-	-test -z "$(check_LIBRARIES)" || rm -f $(check_LIBRARIES)
-
-libt.a: $(libt_a_OBJECTS) $(libt_a_DEPENDENCIES) $(EXTRA_libt_a_DEPENDENCIES) 
-	$(AM_V_at)-rm -f libt.a
-	$(AM_V_AR)$(libt_a_AR) libt.a $(libt_a_OBJECTS) $(libt_a_LIBADD)
-	$(AM_V_at)$(RANLIB) libt.a
-
 clean-checkPROGRAMS:
 	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
 	echo " rm -f" $$list; \
 	rm -f $$list || exit $$?; \
 	test -n "$(EXEEXT)" || exit 0; \
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
 
+clean-checkLIBRARIES:
+	-test -z "$(check_LIBRARIES)" || rm -f $(check_LIBRARIES)
+
+libt.a: $(libt_a_OBJECTS) $(libt_a_DEPENDENCIES) $(EXTRA_libt_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libt.a
+	$(AM_V_AR)$(libt_a_AR) libt.a $(libt_a_OBJECTS) $(libt_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libt.a
+
 t_openpam_ctype$(EXEEXT): $(t_openpam_ctype_OBJECTS) $(t_openpam_ctype_DEPENDENCIES) $(EXTRA_t_openpam_ctype_DEPENDENCIES) 
 	@rm -f t_openpam_ctype$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_openpam_ctype_OBJECTS) $(t_openpam_ctype_LDADD) $(LIBS)
 
 t_openpam_dispatch$(EXEEXT): $(t_openpam_dispatch_OBJECTS) $(t_openpam_dispatch_DEPENDENCIES) $(EXTRA_t_openpam_dispatch_DEPENDENCIES) 
 	@rm -f t_openpam_dispatch$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_openpam_dispatch_OBJECTS) $(t_openpam_dispatch_LDADD) $(LIBS)
 
 t_openpam_readlinev$(EXEEXT): $(t_openpam_readlinev_OBJECTS) $(t_openpam_readlinev_DEPENDENCIES) $(EXTRA_t_openpam_readlinev_DEPENDENCIES) 
 	@rm -f t_openpam_readlinev$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_openpam_readlinev_OBJECTS) $(t_openpam_readlinev_LDADD) $(LIBS)
 
 t_openpam_readword$(EXEEXT): $(t_openpam_readword_OBJECTS) $(t_openpam_readword_DEPENDENCIES) $(EXTRA_t_openpam_readword_DEPENDENCIES) 
 	@rm -f t_openpam_readword$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_openpam_readword_OBJECTS) $(t_openpam_readword_LDADD) $(LIBS)
 
+t_pam_env$(EXEEXT): $(t_pam_env_OBJECTS) $(t_pam_env_DEPENDENCIES) $(EXTRA_t_pam_env_DEPENDENCIES) 
+	@rm -f t_pam_env$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(t_pam_env_OBJECTS) $(t_pam_env_LDADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_ctype.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_dispatch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readlinev.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readword.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_conv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_ctype.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_dispatch.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readlinev.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_openpam_readword.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_conv.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_env.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/t_pam_err.Po@am__quote@ # am--include-marker
 
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
 TAGS: tags
 
 tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  if test $$# -gt 0; then \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      "$$@" $$unique; \
 	  else \
 	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	      $$unique; \
 	  fi; \
 	fi
 ctags: ctags-am
 
 CTAGS: ctags
 ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 cscopelist: cscopelist-am
 
 cscopelist-am: $(am__tagged_files)
 	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
 	esac; \
 	for i in $$list; do \
 	  if test -f "$$i"; then \
 	    echo "$(subdir)/$$i"; \
 	  else \
 	    echo "$$sdir/$$i"; \
 	  fi; \
 	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 # Recover from deleted '.trs' file; this should ensure that
 # "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
 # both 'foo.log' and 'foo.trs'.  Break the recipe in two subshells
 # to avoid problems with "make -n".
 .log.trs:
 	rm -f $< $@
 	$(MAKE) $(AM_MAKEFLAGS) $<
 
 # Leading 'am--fnord' is there to ensure the list of targets does not
 # expand to empty, as could happen e.g. with make check TESTS=''.
 am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
 am--force-recheck:
 	@:
 
 $(TEST_SUITE_LOG): $(TEST_LOGS)
 	@$(am__set_TESTS_bases); \
 	am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
 	redo_bases=`for i in $$bases; do \
 	              am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
 	            done`; \
 	if test -n "$$redo_bases"; then \
 	  redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
 	  redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
 	  if $(am__make_dryrun); then :; else \
 	    rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
 	  fi; \
 	fi; \
 	if test -n "$$am__remaking_logs"; then \
 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 	       "recursion detected" >&2; \
 	elif test -n "$$redo_logs"; then \
 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 	fi; \
 	if $(am__make_dryrun); then :; else \
 	  st=0;  \
 	  errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
 	  for i in $$redo_bases; do \
 	    test -f $$i.trs && test -r $$i.trs \
 	      || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
 	    test -f $$i.log && test -r $$i.log \
 	      || { echo "$$errmsg $$i.log" >&2; st=1; }; \
 	  done; \
 	  test $$st -eq 0 || exit 1; \
 	fi
 	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
 	ws='[ 	]'; \
 	results=`for b in $$bases; do echo $$b.trs; done`; \
 	test -n "$$results" || results=/dev/null; \
 	all=`  grep "^$$ws*:test-result:"           $$results | wc -l`; \
 	pass=` grep "^$$ws*:test-result:$$ws*PASS"  $$results | wc -l`; \
 	fail=` grep "^$$ws*:test-result:$$ws*FAIL"  $$results | wc -l`; \
 	skip=` grep "^$$ws*:test-result:$$ws*SKIP"  $$results | wc -l`; \
 	xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
 	xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
 	error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
 	if test `expr $$fail + $$xpass + $$error` -eq 0; then \
 	  success=true; \
 	else \
 	  success=false; \
 	fi; \
 	br='==================='; br=$$br$$br$$br$$br; \
 	result_count () \
 	{ \
 	    if test x"$$1" = x"--maybe-color"; then \
 	      maybe_colorize=yes; \
 	    elif test x"$$1" = x"--no-color"; then \
 	      maybe_colorize=no; \
 	    else \
 	      echo "$@: invalid 'result_count' usage" >&2; exit 4; \
 	    fi; \
 	    shift; \
 	    desc=$$1 count=$$2; \
 	    if test $$maybe_colorize = yes && test $$count -gt 0; then \
 	      color_start=$$3 color_end=$$std; \
 	    else \
 	      color_start= color_end=; \
 	    fi; \
 	    echo "$${color_start}# $$desc $$count$${color_end}"; \
 	}; \
 	create_testsuite_report () \
 	{ \
 	  result_count $$1 "TOTAL:" $$all   "$$brg"; \
 	  result_count $$1 "PASS: " $$pass  "$$grn"; \
 	  result_count $$1 "SKIP: " $$skip  "$$blu"; \
 	  result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
 	  result_count $$1 "FAIL: " $$fail  "$$red"; \
 	  result_count $$1 "XPASS:" $$xpass "$$red"; \
 	  result_count $$1 "ERROR:" $$error "$$mgn"; \
 	}; \
 	{								\
 	  echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" |	\
 	    $(am__rst_title);						\
 	  create_testsuite_report --no-color;				\
 	  echo;								\
 	  echo ".. contents:: :depth: 2";				\
 	  echo;								\
 	  for b in $$bases; do echo $$b; done				\
 	    | $(am__create_global_log);					\
 	} >$(TEST_SUITE_LOG).tmp || exit 1;				\
 	mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG);			\
 	if $$success; then						\
 	  col="$$grn";							\
 	 else								\
 	  col="$$red";							\
 	  test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG);		\
 	fi;								\
 	echo "$${col}$$br$${std}"; 					\
 	echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}";	\
 	echo "$${col}$$br$${std}"; 					\
 	create_testsuite_report --maybe-color;				\
 	echo "$$col$$br$$std";						\
 	if $$success; then :; else					\
 	  echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}";		\
 	  if test -n "$(PACKAGE_BUGREPORT)"; then			\
 	    echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}";	\
 	  fi;								\
 	  echo "$$col$$br$$std";					\
 	fi;								\
 	$$success || exit 1
 
-check-TESTS:
+check-TESTS: $(check_PROGRAMS) $(check_LIBRARIES)
 	@list='$(RECHECK_LOGS)';           test -z "$$list" || rm -f $$list
 	@list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 	@set +e; $(am__set_TESTS_bases); \
 	log_list=`for i in $$bases; do echo $$i.log; done`; \
 	trs_list=`for i in $$bases; do echo $$i.trs; done`; \
 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
 	exit $$?;
-recheck: all $(check_LIBRARIES) $(check_PROGRAMS)
+recheck: all $(check_PROGRAMS) $(check_LIBRARIES)
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 	@set +e; $(am__set_TESTS_bases); \
 	bases=`for i in $$bases; do echo $$i; done \
 	         | $(am__list_recheck_tests)` || exit 1; \
 	log_list=`for i in $$bases; do echo $$i.log; done`; \
 	log_list=`echo $$log_list`; \
 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
 	        am__force_recheck=am--force-recheck \
 	        TEST_LOGS="$$log_list"; \
 	exit $$?
 t_openpam_ctype.log: t_openpam_ctype$(EXEEXT)
 	@p='t_openpam_ctype$(EXEEXT)'; \
 	b='t_openpam_ctype'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 t_openpam_dispatch.log: t_openpam_dispatch$(EXEEXT)
 	@p='t_openpam_dispatch$(EXEEXT)'; \
 	b='t_openpam_dispatch'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 t_openpam_readword.log: t_openpam_readword$(EXEEXT)
 	@p='t_openpam_readword$(EXEEXT)'; \
 	b='t_openpam_readword'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 t_openpam_readlinev.log: t_openpam_readlinev$(EXEEXT)
 	@p='t_openpam_readlinev$(EXEEXT)'; \
 	b='t_openpam_readlinev'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+t_pam_env.log: t_pam_env$(EXEEXT)
+	@p='t_pam_env$(EXEEXT)'; \
+	b='t_pam_env'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 .test.log:
 	@p='$<'; \
 	$(am__set_b); \
 	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
 @am__EXEEXT_TRUE@.test$(EXEEXT).log:
 @am__EXEEXT_TRUE@	@p='$<'; \
 @am__EXEEXT_TRUE@	$(am__set_b); \
 @am__EXEEXT_TRUE@	$(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
 @am__EXEEXT_TRUE@	--log-file $$b.log --trs-file $$b.trs \
 @am__EXEEXT_TRUE@	$(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \
 @am__EXEEXT_TRUE@	"$$tst" $(AM_TESTS_FD_REDIRECT)
 
-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
 	  dist_files=`for file in $$list; do echo $$file; done | \
 	  sed -e "s|^$$srcdirstrip/||;t" \
 	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
 	case $$dist_files in \
 	  */*) $(MKDIR_P) `echo "$$dist_files" | \
 			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
 			   sort -u` ;; \
 	esac; \
 	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d "$(distdir)/$$file"; then \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
 	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
 	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
 	    test -f "$(distdir)/$$file" \
 	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_LIBRARIES) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LIBRARIES)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile $(HEADERS)
 installdirs:
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-am
 install-strip:
 	if test -z '$(STRIP)'; then \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	      install; \
 	else \
 	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
 	fi
 mostlyclean-generic:
 	-test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
 	-test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
 	-test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 
 clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
 clean-am: clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/t_openpam_ctype.Po
+	-rm -f ./$(DEPDIR)/t_openpam_dispatch.Po
+	-rm -f ./$(DEPDIR)/t_openpam_readlinev.Po
+	-rm -f ./$(DEPDIR)/t_openpam_readword.Po
+	-rm -f ./$(DEPDIR)/t_pam_conv.Po
+	-rm -f ./$(DEPDIR)/t_pam_env.Po
+	-rm -f ./$(DEPDIR)/t_pam_err.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
 html: html-am
 
 html-am:
 
 info: info-am
 
 info-am:
 
 install-data-am:
 
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
 install-exec-am:
 
 install-html: install-html-am
 
 install-html-am:
 
 install-info: install-info-am
 
 install-info-am:
 
 install-man:
 
 install-pdf: install-pdf-am
 
 install-pdf-am:
 
 install-ps: install-ps-am
 
 install-ps-am:
 
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/t_openpam_ctype.Po
+	-rm -f ./$(DEPDIR)/t_openpam_dispatch.Po
+	-rm -f ./$(DEPDIR)/t_openpam_readlinev.Po
+	-rm -f ./$(DEPDIR)/t_openpam_readword.Po
+	-rm -f ./$(DEPDIR)/t_pam_conv.Po
+	-rm -f ./$(DEPDIR)/t_pam_env.Po
+	-rm -f ./$(DEPDIR)/t_pam_err.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
 pdf: pdf-am
 
 pdf-am:
 
 ps: ps-am
 
 ps-am:
 
 uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
-	clean-checkLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool cscopelist-am ctags ctags-am distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am recheck tags tags-am uninstall \
-	uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \
+	check-am clean clean-checkLIBRARIES clean-checkPROGRAMS \
+	clean-generic clean-libtool cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: projects/clang800-import/contrib/openpam/t/t_pam_env.c
===================================================================
--- projects/clang800-import/contrib/openpam/t/t_pam_env.c	(nonexistent)
+++ projects/clang800-import/contrib/openpam/t/t_pam_env.c	(revision 344549)
@@ -0,0 +1,202 @@
+/*-
+ * Copyright (c) 2019 Dag-Erling Smørgrav
+ * 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. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $OpenPAM$
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdint.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <cryb/test.h>
+
+#include <security/pam_appl.h>
+#include <security/openpam.h>
+
+#include "t_pam_err.h"
+
+#define T_ENV_NAME	"MAGIC_WORDS"
+#define T_ENV_VALUE	"SQUEAMISH OSSIFRAGE"
+#define T_ENV_NAMEVALUE	T_ENV_NAME "=" T_ENV_VALUE
+
+struct pam_conv t_null_pamc;
+
+
+/***************************************************************************
+ * Tests
+ */
+
+static int
+t_env_empty(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+	pam_handle_t *pamh;
+	char **envlist;
+	int pam_err, ret;
+
+	ret = 1;
+	pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+	t_assert(pam_err == PAM_SUCCESS);
+	envlist = pam_getenvlist(pamh);
+	ret &= t_is_not_null(envlist);
+	if (envlist != NULL) {
+		ret &= t_is_null(*envlist);
+		openpam_free_envlist(envlist);
+	}
+	pam_end(pamh, pam_err);
+	return (ret);
+}
+
+static int
+t_putenv_simple(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+	pam_handle_t *pamh;
+	char **envlist;
+	int pam_err, ret;
+
+	ret = 1;
+	pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+	t_assert(pam_err == PAM_SUCCESS);
+	pam_err = pam_putenv(pamh, T_ENV_NAMEVALUE);
+	ret &= t_compare_pam_err(PAM_SUCCESS, pam_err);
+	envlist = pam_getenvlist(pamh);
+	ret &= t_is_not_null(envlist);
+	if (envlist != NULL) {
+		ret &= t_compare_str(T_ENV_NAMEVALUE, envlist[0])
+		    & t_is_null(envlist[1]);
+		openpam_free_envlist(envlist);
+	}
+	pam_end(pamh, pam_err);
+	return (ret);
+}
+
+static int
+t_setenv_simple(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+	pam_handle_t *pamh;
+	char **envlist;
+	int pam_err, ret;
+
+	ret = 1;
+	pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+	t_assert(pam_err == PAM_SUCCESS);
+	pam_err = pam_setenv(pamh, T_ENV_NAME, T_ENV_VALUE, 0);
+	ret &= t_compare_pam_err(PAM_SUCCESS, pam_err);
+	envlist = pam_getenvlist(pamh);
+	ret &= t_is_not_null(envlist);
+	if (envlist != NULL) {
+		ret &= t_compare_str(T_ENV_NAMEVALUE, envlist[0])
+		    & t_is_null(envlist[1]);
+		openpam_free_envlist(envlist);
+	}
+	pam_end(pamh, pam_err);
+	return (ret);
+}
+
+static int
+t_getenv_empty(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+	pam_handle_t *pamh;
+	const char *value;
+	int pam_err, ret;
+
+	ret = 1;
+	pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+	t_assert(pam_err == PAM_SUCCESS);
+	value = pam_getenv(pamh, T_ENV_NAME);
+	ret &= t_compare_str(NULL, value);
+	pam_end(pamh, pam_err);
+	return (ret);
+}
+
+static int
+t_getenv_simple_miss(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+	pam_handle_t *pamh;
+	const char *value;
+	int pam_err, ret;
+
+	ret = 1;
+	pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+	t_assert(pam_err == PAM_SUCCESS);
+	pam_err = pam_setenv(pamh, T_ENV_NAME, T_ENV_VALUE, 0);
+	t_assert(pam_err == PAM_SUCCESS);
+	value = pam_getenv(pamh, "XYZZY");
+	ret &= t_compare_str(NULL, value);
+	pam_end(pamh, pam_err);
+	return (ret);
+}
+
+static int
+t_getenv_simple_hit(char **desc CRYB_UNUSED, void *arg CRYB_UNUSED)
+{
+	pam_handle_t *pamh;
+	const char *value;
+	int pam_err, ret;
+
+	ret = 1;
+	pam_err = pam_start("t_pam_env", "test", &t_null_pamc, &pamh);
+	t_assert(pam_err == PAM_SUCCESS);
+	pam_err = pam_setenv(pamh, T_ENV_NAME, T_ENV_VALUE, 0);
+	t_assert(pam_err == PAM_SUCCESS);
+	value = pam_getenv(pamh, T_ENV_NAME);
+	ret &= t_compare_str(T_ENV_VALUE, value);
+	pam_end(pamh, pam_err);
+	return (ret);
+}
+
+
+/***************************************************************************
+ * Boilerplate
+ */
+
+static int
+t_prepare(int argc CRYB_UNUSED, char *argv[] CRYB_UNUSED)
+{
+
+	openpam_set_feature(OPENPAM_FALLBACK_TO_OTHER, 0);
+
+	t_add_test(t_env_empty, NULL, "initially empty");
+	t_add_test(t_putenv_simple, NULL, "put - simple");
+	t_add_test(t_setenv_simple, NULL, "set - simple");
+	t_add_test(t_getenv_empty, NULL, "get - empty");
+	t_add_test(t_getenv_simple_miss, NULL, "get - simple (miss)");
+	t_add_test(t_getenv_simple_hit, NULL, "get - simple (hit)");
+
+	return (0);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	t_main(t_prepare, NULL, argc, argv);
+}
Index: projects/clang800-import/contrib/openpam/t/t_pam_err.c
===================================================================
--- projects/clang800-import/contrib/openpam/t/t_pam_err.c	(nonexistent)
+++ projects/clang800-import/contrib/openpam/t/t_pam_err.c	(revision 344549)
@@ -0,0 +1,63 @@
+/*-
+ * Copyright (c) 2019 Dag-Erling Smørgrav
+ * 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. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $OpenPAM$
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdint.h>
+#include <unistd.h>
+
+#include <cryb/test.h>
+
+#include <security/pam_appl.h>
+#include <security/openpam.h>
+
+#include "openpam_impl.h"
+
+#include "t_pam_err.h"
+
+int
+t_compare_pam_err(int expected, int received)
+{
+
+	if (expected == received)
+		return (1);
+	if (expected >= 0 && expected < PAM_NUM_ERRORS)
+		t_printv("expected %s, ", pam_err_name[expected]);
+	else
+		t_printv("expected %d, ", expected);
+	if (received >= 0 && received < PAM_NUM_ERRORS)
+		t_printv("received %s\n", pam_err_name[received]);
+	else
+		t_printv("received %d\n", received);
+	return (0);
+}
Index: projects/clang800-import/contrib/openpam/t/t_pam_err.h
===================================================================
--- projects/clang800-import/contrib/openpam/t/t_pam_err.h	(nonexistent)
+++ projects/clang800-import/contrib/openpam/t/t_pam_err.h	(revision 344549)
@@ -0,0 +1,44 @@
+/*-
+ * Copyright (c) 2019 Dag-Erling Smørgrav
+ * 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. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $OpenPAM$
+ */
+
+#ifndef T_PAM_ERR_H_INCLUDED
+#define T_PAM_ERR_H_INCLUDED
+
+int t_compare_pam_err(int, int);
+
+static inline int
+t_pam_success(int received)
+{
+
+	return t_compare_pam_err(PAM_SUCCESS, received);
+}
+
+#endif
Index: projects/clang800-import/contrib/openpam/test-driver
===================================================================
--- projects/clang800-import/contrib/openpam/test-driver	(revision 344548)
+++ projects/clang800-import/contrib/openpam/test-driver	(revision 344549)
@@ -1,148 +1,148 @@
 #! /bin/sh
 # test-driver - basic testsuite driver script.
 
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2, or (at your option)
 # any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
 # This file is maintained in Automake, please report
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
 # Make unconditional expansion of undefined variables an error.  This
 # helps a lot in preventing typo-related bugs.
 set -u
 
 usage_error ()
 {
   echo "$0: $*" >&2
   print_usage >&2
   exit 2
 }
 
 print_usage ()
 {
   cat <<END
 Usage:
   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
               [--expect-failure={yes|no}] [--color-tests={yes|no}]
               [--enable-hard-errors={yes|no}] [--]
               TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
 The '--test-name', '--log-file' and '--trs-file' options are mandatory.
 END
 }
 
 test_name= # Used for reporting.
 log_file=  # Where to save the output of the test script.
 trs_file=  # Where to save the metadata of the test run.
 expect_failure=no
 color_tests=no
 enable_hard_errors=yes
 while test $# -gt 0; do
   case $1 in
   --help) print_usage; exit $?;;
   --version) echo "test-driver $scriptversion"; exit $?;;
   --test-name) test_name=$2; shift;;
   --log-file) log_file=$2; shift;;
   --trs-file) trs_file=$2; shift;;
   --color-tests) color_tests=$2; shift;;
   --expect-failure) expect_failure=$2; shift;;
   --enable-hard-errors) enable_hard_errors=$2; shift;;
   --) shift; break;;
   -*) usage_error "invalid option: '$1'";;
    *) break;;
   esac
   shift
 done
 
 missing_opts=
 test x"$test_name" = x && missing_opts="$missing_opts --test-name"
 test x"$log_file"  = x && missing_opts="$missing_opts --log-file"
 test x"$trs_file"  = x && missing_opts="$missing_opts --trs-file"
 if test x"$missing_opts" != x; then
   usage_error "the following mandatory options are missing:$missing_opts"
 fi
 
 if test $# -eq 0; then
   usage_error "missing argument"
 fi
 
 if test $color_tests = yes; then
   # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
   red='' # Red.
   grn='' # Green.
   lgn='' # Light green.
   blu='' # Blue.
   mgn='' # Magenta.
   std=''     # No color.
 else
   red= grn= lgn= blu= mgn= std=
 fi
 
 do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
 trap "st=129; $do_exit" 1
 trap "st=130; $do_exit" 2
 trap "st=141; $do_exit" 13
 trap "st=143; $do_exit" 15
 
 # Test script is run here.
 "$@" >$log_file 2>&1
 estatus=$?
 
 if test $enable_hard_errors = no && test $estatus -eq 99; then
   tweaked_estatus=1
 else
   tweaked_estatus=$estatus
 fi
 
 case $tweaked_estatus:$expect_failure in
   0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
   0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
   77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
   99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
   *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
   *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
 esac
 
 # Report the test outcome and exit status in the logs, so that one can
 # know whether the test passed or failed simply by looking at the '.log'
 # file, without the need of also peaking into the corresponding '.trs'
 # file (automake bug#11814).
 echo "$res $test_name (exit status: $estatus)" >>$log_file
 
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"
 
 # Register the test result, and other relevant metadata.
 echo ":test-result: $res" > $trs_file
 echo ":global-test-result: $res" >> $trs_file
 echo ":recheck: $recheck" >> $trs_file
 echo ":copy-in-global-log: $gcopy" >> $trs_file
 
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
Index: projects/clang800-import/contrib/openpam
===================================================================
--- projects/clang800-import/contrib/openpam	(revision 344548)
+++ projects/clang800-import/contrib/openpam	(revision 344549)

Property changes on: projects/clang800-import/contrib/openpam
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
   Merged /head/contrib/openpam:r343202-344548
   Merged /vendor/openpam/dist:r344500
Index: projects/clang800-import/lib/libifconfig/Makefile
===================================================================
--- projects/clang800-import/lib/libifconfig/Makefile	(revision 344548)
+++ projects/clang800-import/lib/libifconfig/Makefile	(revision 344549)
@@ -1,23 +1,21 @@
 # $FreeBSD$
 
 PACKAGE=	lib${LIB}
 LIB=		ifconfig
-PRIVATELIB=	true
-# Don't build shared library, for now.
-NO_PIC= 
+INTERNALLIB=	true
 
 SHLIBDIR?=	/lib
 SHLIB_MAJOR=	1
 SRCS=		libifconfig.c libifconfig_carp.c libifconfig_inet.c
 SRCS+=		libifconfig_inet6.c libifconfig_internal.c libifconfig_lagg.c
 SRCS+=		libifconfig_media.c
 
 INCSDIR=	${INCLUDEDIR}
 INCS=		libifconfig.h
 
 #MAN=		libifconfig.3
 
 CFLAGS+= -I${.CURDIR}
 NO_WCAST_ALIGN= yes
 
 .include <bsd.lib.mk>
Index: projects/clang800-import/share/man/man9/sysctl.9
===================================================================
--- projects/clang800-import/share/man/man9/sysctl.9	(revision 344548)
+++ projects/clang800-import/share/man/man9/sysctl.9	(revision 344549)
@@ -1,897 +1,1006 @@
 .\"
 .\" Copyright (c) 2006 Robert N. M. Watson
 .\" 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.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 1, 2018
+.Dd February 25, 2019
 .Dt SYSCTL 9
 .Os
 .Sh NAME
 .Nm SYSCTL_DECL ,
+.Nm SYSCTL_ADD_BOOL ,
+.Nm SYSCTL_ADD_COUNTER_U64 ,
+.Nm SYSCTL_ADD_COUNTER_U64_ARRAY ,
 .Nm SYSCTL_ADD_INT ,
 .Nm SYSCTL_ADD_LONG ,
 .Nm SYSCTL_ADD_NODE ,
 .Nm SYSCTL_ADD_NODE_WITH_LABEL ,
 .Nm SYSCTL_ADD_OPAQUE ,
 .Nm SYSCTL_ADD_PROC ,
 .Nm SYSCTL_ADD_QUAD ,
 .Nm SYSCTL_ADD_ROOT_NODE ,
 .Nm SYSCTL_ADD_S8 ,
 .Nm SYSCTL_ADD_S16 ,
 .Nm SYSCTL_ADD_S32 ,
 .Nm SYSCTL_ADD_S64 ,
+.Nm SYSCTL_ADD_SBINTIME_MSEC ,
+.Nm SYSCTL_ADD_SBINTIME_USEC ,
 .Nm SYSCTL_ADD_STRING ,
 .Nm SYSCTL_ADD_STRUCT ,
 .Nm SYSCTL_ADD_U8 ,
 .Nm SYSCTL_ADD_U16 ,
 .Nm SYSCTL_ADD_U32 ,
 .Nm SYSCTL_ADD_U64 ,
 .Nm SYSCTL_ADD_UAUTO ,
 .Nm SYSCTL_ADD_UINT ,
 .Nm SYSCTL_ADD_ULONG ,
 .Nm SYSCTL_ADD_UQUAD ,
+.Nm SYSCTL_ADD_UMA_CUR ,
+.Nm SYSCTL_ADD_UMA_MAX ,
 .Nm SYSCTL_CHILDREN ,
 .Nm SYSCTL_STATIC_CHILDREN ,
 .Nm SYSCTL_NODE_CHILDREN ,
 .Nm SYSCTL_PARENT ,
+.Nm SYSCTL_BOOL ,
+.Nm SYSCTL_COUNTER_U64 ,
+.Nm SYSCTL_COUNTER_U64_ARRAY ,
 .Nm SYSCTL_INT ,
 .Nm SYSCTL_INT_WITH_LABEL ,
 .Nm SYSCTL_LONG ,
 .Nm SYSCTL_NODE ,
 .Nm SYSCTL_NODE_WITH_LABEL ,
 .Nm SYSCTL_OPAQUE ,
 .Nm SYSCTL_PROC ,
 .Nm SYSCTL_QUAD ,
 .Nm SYSCTL_ROOT_NODE ,
 .Nm SYSCTL_S8 ,
 .Nm SYSCTL_S16 ,
 .Nm SYSCTL_S32 ,
 .Nm SYSCTL_S64 ,
+.Nm SYSCTL_SBINTIME_MSEC ,
+.Nm SYSCTL_SBINTIME_USEC ,
 .Nm SYSCTL_STRING ,
 .Nm SYSCTL_STRUCT ,
 .Nm SYSCTL_U8 ,
 .Nm SYSCTL_U16 ,
 .Nm SYSCTL_U32 ,
 .Nm SYSCTL_U64 ,
 .Nm SYSCTL_UINT ,
 .Nm SYSCTL_ULONG ,
-.Nm SYSCTL_UQUAD
+.Nm SYSCTL_UQUAD ,
+.Nm SYSCTL_UMA_CUR ,
+.Nm SYSCTL_UMA_MAX
 .Nd Dynamic and static sysctl MIB creation functions
 .Sh SYNOPSIS
 .In sys/param.h
 .In sys/sysctl.h
 .Fn SYSCTL_DECL name
 .Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_BOOL
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "bool *ptr"
+.Fa "uint8_t val"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_COUNTER_U64
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "counter_u64_t *ptr"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_COUNTER_U64_ARRAY
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "counter_u64_t *ptr"
+.Fa "intmax_t len"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_INT
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "int *ptr"
 .Fa "int val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_LONG
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "long *ptr"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_NODE
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "int (*handler)(SYSCTL_HANDLER_ARGS)"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_NODE_WITH_LABEL
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "int (*handler)(SYSCTL_HANDLER_ARGS)"
 .Fa "const char *descr"
 .Fa "const char *label"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_OPAQUE
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "void *ptr"
 .Fa "intptr_t len"
 .Fa "const char *format"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_PROC
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "void *arg1"
 .Fa "intptr_t arg2"
 .Fa "int (*handler) (SYSCTL_HANDLER_ARGS)"
 .Fa "const char *format"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_QUAD
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "int64_t *ptr"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_ROOT_NODE
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "int (*handler)(SYSCTL_HANDLER_ARGS)"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_S8
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "int8_t *ptr"
 .Fa "int8_t val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_S16
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "int16_t *ptr"
 .Fa "int16_t val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_S32
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "int32_t *ptr"
 .Fa "int32_t val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_S64
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "int64_t *ptr"
 .Fa "int64_t val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_SBINTIME_MSEC
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "sbintime_t *ptr"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_SBINTIME_USEC
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "sbintime_t *ptr"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_STRING
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "char *ptr"
 .Fa "intptr_t len"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_STRUCT
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "void *ptr"
 .Fa struct_type
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_U8
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "uint8_t *ptr"
 .Fa "uint8_t val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_U16
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "uint16_t *ptr"
 .Fa "uint16_t val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_U32
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "uint32_t *ptr"
 .Fa "uint32_t val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_U64
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "uint64_t *ptr"
 .Fa "uint64_t val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_UINT
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "unsigned int *ptr"
 .Fa "unsigned int val"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_ULONG
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "unsigned long *ptr"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_UQUAD
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "uint64_t *ptr"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_UMA_CUR
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "uma_zone_t ptr"
+.Fa "const char *descr"
+.Fc
+.Ft struct sysctl_oid *
+.Fo SYSCTL_ADD_UMA_MAX
+.Fa "struct sysctl_ctx_list *ctx"
+.Fa "struct sysctl_oid_list *parent"
+.Fa "int number"
+.Fa "const char *name"
+.Fa "int ctlflags"
+.Fa "uma_zone_t ptr"
+.Fa "const char *descr"
+.Fc
+.Fa "const char *descr"
+.Ft struct sysctl_oid *
 .Fo SYSCTL_ADD_UAUTO
 .Fa "struct sysctl_ctx_list *ctx"
 .Fa "struct sysctl_oid_list *parent"
 .Fa "int number"
 .Fa "const char *name"
 .Fa "int ctlflags"
 .Fa "void *ptr"
 .Fa "const char *descr"
 .Fc
 .Ft struct sysctl_oid_list *
 .Fo SYSCTL_CHILDREN
 .Fa "struct sysctl_oid *oidp"
 .Fc
 .Ft struct sysctl_oid_list *
 .Fo SYSCTL_STATIC_CHILDREN
 .Fa "struct sysctl_oid_list OID_NAME"
 .Fc
 .Ft struct sysctl_oid_list *
 .Fo SYSCTL_NODE_CHILDREN
 .Fa "parent"
 .Fa "name"
 .Fc
 .Ft struct sysctl_oid *
 .Fo SYSCTL_PARENT
 .Fa "struct sysctl_oid *oid"
 .Fc
+.Fn SYSCTL_BOOL parent number name ctlflags ptr val descr
+.Fn SYSCTL_COUNTER_U64 parent number name ctlflags ptr descr
+.Fn SYSCTL_COUNTER_U64_ARRAY parent number name ctlflags ptr len descr
 .Fn SYSCTL_INT parent number name ctlflags ptr val descr
 .Fn SYSCTL_INT_WITH_LABEL parent number name ctlflags ptr val descr label
 .Fn SYSCTL_LONG parent number name ctlflags ptr val descr
 .Fn SYSCTL_NODE parent number name ctlflags handler descr
 .Fn SYSCTL_NODE_WITH_LABEL parent number name ctlflags handler descr label
 .Fn SYSCTL_OPAQUE parent number name ctlflags ptr len format descr
 .Fn SYSCTL_PROC parent number name ctlflags arg1 arg2 handler format descr
 .Fn SYSCTL_QUAD parent number name ctlflags ptr val descr
 .Fn SYSCTL_ROOT_NODE number name ctlflags handler descr
 .Fn SYSCTL_S8 parent number name ctlflags ptr val descr
 .Fn SYSCTL_S16 parent number name ctlflags ptr val descr
 .Fn SYSCTL_S32 parent number name ctlflags ptr val descr
 .Fn SYSCTL_S64 parent number name ctlflags ptr val descr
+.Fn SYSCTL_SBINTIME_MSEC parent number name ctlflags ptr descr
+.Fn SYSCTL_SBINTIME_USEC parent number name ctlflags ptr descr
 .Fn SYSCTL_STRING parent number name ctlflags arg len descr
 .Fn SYSCTL_STRUCT parent number name ctlflags ptr struct_type descr
 .Fn SYSCTL_U8 parent number name ctlflags ptr val descr
 .Fn SYSCTL_U16 parent number name ctlflags ptr val descr
 .Fn SYSCTL_U32 parent number name ctlflags ptr val descr
 .Fn SYSCTL_U64 parent number name ctlflags ptr val descr
 .Fn SYSCTL_UINT parent number name ctlflags ptr val descr
 .Fn SYSCTL_ULONG parent number name ctlflags ptr val descr
 .Fn SYSCTL_UQUAD parent number name ctlflags ptr val descr
+.Fn SYSCTL_UMA_MAX parent number name ctlflags ptr descr
+.Fn SYSCTL_UMA_CUR parent number name ctlflags ptr descr
 .Sh DESCRIPTION
 The
 .Nm SYSCTL
 kernel interface allows dynamic or static creation of
 .Xr sysctl 8
 MIB entries.
 All static sysctls are automatically destroyed when the module which
 they are part of is unloaded.
 Most top level categories are created statically and are available to
 all kernel code and its modules.
 .Sh DESCRIPTION OF ARGUMENTS
 .Bl -tag -width ctlflags
 .It Fa ctx
 Pointer to sysctl context or NULL, if no context.
 See
 .Xr sysctl_ctx_init 9
 for how to create a new sysctl context.
 Programmers are strongly advised to use contexts to organize the
 dynamic OIDs which they create because when a context is destroyed all
 belonging sysctls are destroyed as well.
 This makes the sysctl cleanup code much simpler.
 Else deletion of all created OIDs is required at module unload.
 .It Fa parent
 A pointer to a
 .Li struct sysctl_oid_list ,
 which is the head of the parent's list of children.
 This pointer is retrieved using the
 .Fn SYSCTL_STATIC_CHILDREN
 macro for static sysctls and the
 .Fn SYSCTL_CHILDREN
 macro for dynamic sysctls.
 The
 .Fn SYSCTL_PARENT
 macro can be used to get the parent of an OID.
 The macro returns NULL if there is no parent.
 .It Fa number
 The OID number that will be assigned to this OID.
 In almost all cases this should be set to
 .Dv OID_AUTO ,
 which will result in the assignment of the next available OID number.
 .It Fa name
 The name of the OID.
 The newly created OID will contain a copy of the name.
 .It Fa ctlflags
 A bit mask of sysctl control flags.
 See the section below describing all the control flags.
 .It Fa arg1
 First callback argument for procedure sysctls.
 .It Fa arg2
 Second callback argument for procedure sysctls.
 .It Fa len
 The length of the data pointed to by the
 .Fa ptr
 argument.
 For string type OIDs a length of zero means that
 .Xr strlen 3
 will be used to get the length of the string at each access to the OID.
+For array type OIDs the length must be greater than zero.
 .It Fa ptr
 Pointer to sysctl variable or string data.
 For sysctl values the pointer can be SYSCTL_NULL_XXX_PTR which means the OID is read-only and the returned value should be taken from the
 .Fa val
 argument.
 .It Fa val
 If the
 .Fa ptr
 argument is SYSCTL_NULL_XXX_PTR, gives the constant value returned by this OID.
 Else this argument is not used.
 .It Fa struct_type
 Name of structure type.
 .It Fa handler
 A pointer to the function
 that is responsible for handling read and write requests
 to this OID.
 There are several standard handlers
 that support operations on nodes,
 integers, strings and opaque objects.
 It is possible to define custom handlers using the
 .Fn SYSCTL_PROC
 macro or the
 .Fn SYSCTL_ADD_PROC
 function.
 .It Fa format
 A pointer to a string
 which specifies the format of the OID in a symbolic way.
 This format is used as a hint by
 .Xr sysctl 8
 to apply proper data formatting for display purposes.
 .Pp
 Current formats:
 .Bl -tag -width "S,TYPE" -compact -offset indent
 .It Cm N
 node
 .It Cm A
 .Li "char *"
 .It Cm I
 .Li "int"
 .It Cm IK Ns Op Ar n
 temperature in Kelvin, multiplied by an optional single digit
 power of ten scaling factor: 1 (default) gives deciKelvin, 0 gives Kelvin, 3
 gives milliKelvin
 .It Cm IU
 .Li "unsigned int"
 .It Cm L
 .Li "long"
 .It Cm LU
 .Li "unsigned long"
 .It Cm Q
 .Li "quad_t"
 .It Cm QU
 .Li "u_quad_t"
 .It Cm "S,TYPE"
 .Li "struct TYPE"
 structures
 .El
 .It Fa descr
 A pointer to a textual description of the OID.
 .It Fa label
 A pointer to an aggregation label for this component of the OID.
 To make it easier to export sysctl data to monitoring systems that
 support aggregations through labels (e.g., Prometheus),
 this argument can be used to attach a label name to an OID.
 The label acts as a hint that this component's name should not be part
 of the metric's name,
 but attached to the metric as a label instead.
 .Pp
 Labels should only be applied to siblings that are structurally similar
 and encode the same type of value,
 as aggregation is of no use otherwise.
 .El
 .Sh CREATING ROOT NODES
 Sysctl MIBs or OIDs are created in a hierarchical tree.
 The nodes at the bottom of the tree are called root nodes, and have no
 parent OID.
 To create bottom tree nodes the
 .Fn SYSCTL_ROOT_NODE
 macro or the
 .Fn SYSCTL_ADD_ROOT_NODE
 function needs to be used.
 By default all static sysctl node OIDs are global and need a
 .Fn SYSCTL_DECL
 statement prior to their
 .Fn SYSCTL_NODE
 definition statement, typically in a so-called header file.
 .Sh CREATING SYSCTL STRINGS
 Zero terminated character strings sysctls are created either using the
 .Fn SYSCTL_STRING
 macro or the
 .Fn SYSCTL_ADD_STRING
 function.
 If the
 .Fa len
 argument in zero, the string length is computed at every access to the OID using
 .Xr strlen 3 .
 .Sh CREATING OPAQUE SYSCTLS
 The
 .Fn SYSCTL_OPAQUE
 or
 .Fn SYSCTL_STRUCT
 macros or the
 .Fn SYSCTL_ADD_OPAQUE
 or
 .Fn SYSCTL_ADD_STRUCT
 functions create an OID that handle any chunk of data
 of the size specified by the
 .Fa len
 argument and data pointed to by the
 .Fa ptr
 argument.
 When using the structure version the type is encoded as part of the
 created sysctl.
 .Sh CREATING CUSTOM SYSCTLS
 The
 .Fn SYSCTL_PROC
 macro and the
 .Fn SYSCTL_ADD_PROC
 function
 create OIDs with the specified
 .Pa handler
 function.
 The handler is responsible for handling all read and write requests to
 the OID.
 This OID type is especially useful if the kernel data is not easily
 accessible, or needs to be processed before exporting.
 .Sh CREATING A STATIC SYSCTL
 Static sysctls are declared using one of the
+.Fn SYSCTL_BOOL ,
+.Fn SYSCTL_COUNTER_U64 ,
+.Fn SYSCTL_COUNTER_U64_ARRAY ,
 .Fn SYSCTL_INT ,
 .Fn SYSCTL_INT_WITH_LABEL ,
 .Fn SYSCTL_LONG ,
 .Fn SYSCTL_NODE ,
 .Fn SYSCTL_NODE_WITH_LABEL ,
 .Fn SYSCTL_OPAQUE ,
 .Fn SYSCTL_PROC ,
 .Fn SYSCTL_QUAD ,
 .Fn SYSCTL_ROOT_NODE ,
 .Fn SYSCTL_S8 ,
 .Fn SYSCTL_S16 ,
 .Fn SYSCTL_S32 ,
 .Fn SYSCTL_S64 ,
+.Fn SYSCTL_SBINTIME_MSEC ,
+.Fn SYSCTL_SBINTIME_USEC ,
 .Fn SYSCTL_STRING ,
 .Fn SYSCTL_STRUCT ,
 .Fn SYSCTL_U8 ,
 .Fn SYSCTL_U16 ,
 .Fn SYSCTL_U32 ,
 .Fn SYSCTL_U64 ,
 .Fn SYSCTL_UINT ,
-.Fn SYSCTL_ULONG
+.Fn SYSCTL_ULONG ,
+.Fn SYSCTL_UQUAD ,
+.Fn SYSCTL_UMA_CUR
 or
-.Fn SYSCTL_UQUAD
+.Fn SYSCTL_UMA_MAX
 macros.
 .Sh CREATING A DYNAMIC SYSCTL
 Dynamic nodes are created using one of the
+.Fn SYSCTL_ADD_BOOL ,
+.Fn SYSCTL_ADD_COUNTER_U64 ,
+.Fn SYSCTL_ADD_COUNTER_U64_ARRAY ,
 .Fn SYSCTL_ADD_INT ,
 .Fn SYSCTL_ADD_LONG ,
 .Fn SYSCTL_ADD_NODE ,
 .Fn SYSCTL_ADD_NODE_WITH_LABEL ,
 .Fn SYSCTL_ADD_OPAQUE ,
 .Fn SYSCTL_ADD_PROC ,
 .Fn SYSCTL_ADD_QUAD ,
 .Fn SYSCTL_ADD_ROOT_NODE ,
 .Fn SYSCTL_ADD_S8 ,
 .Fn SYSCTL_ADD_S16 ,
 .Fn SYSCTL_ADD_S32 ,
 .Fn SYSCTL_ADD_S64 ,
+.Fn SYSCTL_ADD_SBINTIME_MSEC ,
+.Fn SYSCTL_ADD_SBINTIME_USEC ,
 .Fn SYSCTL_ADD_STRING ,
 .Fn SYSCTL_ADD_STRUCT ,
 .Fn SYSCTL_ADD_U8 ,
 .Fn SYSCTL_ADD_U16 ,
 .Fn SYSCTL_ADD_U32 ,
 .Fn SYSCTL_ADD_U64 ,
 .Fn SYSCTL_ADD_UAUTO ,
 .Fn SYSCTL_ADD_UINT ,
 .Fn SYSCTL_ADD_ULONG ,
+.Fn SYSCTL_ADD_UQUAD ,
+.Fn SYSCTL_ADD_UMA_CUR
 or
-.Fn SYSCTL_UQUAD
+.Fn SYSCTL_ADD_UMA_MAX
 functions.
 See
 .Xr sysctl_remove_oid 9
 or
 .Xr sysctl_ctx_free 9
 for more information on how to destroy a dynamically created OID.
 .Sh CONTROL FLAGS
 For most of the above functions and macros, declaring a type as part
 of the access flags is not necessary \[em] however, when declaring a
 sysctl implemented by a function, including a type in the access mask
 is required:
 .Bl -tag -width ".Dv CTLTYPE_NOFETCH"
 .It Dv CTLTYPE_NODE
 This is a node intended to be a parent for other nodes.
 .It Dv CTLTYPE_INT
 This is a signed integer.
 .It Dv CTLTYPE_STRING
 This is a nul-terminated string stored in a character array.
 .It Dv CTLTYPE_S8
 This is an 8-bit signed integer.
 .It Dv CTLTYPE_S16
 This is a 16-bit signed integer.
 .It Dv CTLTYPE_S32
 This is a 32-bit signed integer.
 .It Dv CTLTYPE_S64
 This is a 64-bit signed integer.
 .It Dv CTLTYPE_OPAQUE
 This is an opaque data structure.
 .It Dv CTLTYPE_STRUCT
 Alias for
 .Dv CTLTYPE_OPAQUE .
 .It Dv CTLTYPE_U8
 This is an 8-bit unsigned integer.
 .It Dv CTLTYPE_U16
 This is a 16-bit unsigned integer.
 .It Dv CTLTYPE_U32
 This is a 32-bit unsigned integer.
 .It Dv CTLTYPE_U64
 This is a 64-bit unsigned integer.
 .It Dv CTLTYPE_UINT
 This is an unsigned integer.
 .It Dv CTLTYPE_LONG
 This is a signed long.
 .It Dv CTLTYPE_ULONG
 This is an unsigned long.
 .El
 .Pp
 All sysctl types except for new node declarations require one of the following
 flags to be set indicating the read and write disposition of the sysctl:
 .Bl -tag -width ".Dv CTLFLAG_ANYBODY"
 .It Dv CTLFLAG_RD
 This is a read-only sysctl.
 .It Dv CTLFLAG_RDTUN
 This is a read-only sysctl and tunable which is tried fetched once
 from the system environment early during module load or system boot.
 .It Dv CTLFLAG_WR
 This is a writable sysctl.
 .It Dv CTLFLAG_RW
 This sysctl is readable and writable.
 .It Dv CTLFLAG_RWTUN
 This is a readable and writeable sysctl and tunable which is tried
 fetched once from the system environment early during module load or
 system boot.
 .It Dv CTLFLAG_NOFETCH
 In case the node is marked as a tunable using the CTLFLAG_[XX]TUN,
 this flag will prevent fetching the initial value from the system
 environment.
 Typically this flag should only be used for very early
 low level system setup code, and not by common drivers and modules.
 .It Dv CTLFLAG_MPSAFE
 This
 .Xr sysctl 9
 handler is MP safe.
 Do not grab Giant around calls to this handler.
 This should only be used for
 .Fn SYSCTL_PROC
 entries.
 .El
 .Pp
 Additionally, any of the following optional flags may also be specified:
 .Bl -tag -width ".Dv CTLFLAG_ANYBODY"
 .It Dv CTLFLAG_ANYBODY
 Any user or process can write to this sysctl.
 .It Dv CTLFLAG_CAPRD
 A process in capability mode can read from this sysctl.
 .It Dv CTLFLAG_CAPWR
 A process in capability mode can write to this sysctl.
 .It Dv CTLFLAG_SECURE
 This sysctl can be written to only if the effective securelevel of the
 process is \[<=] 0.
 .It Dv CTLFLAG_PRISON
 This sysctl can be written to by processes in
 .Xr jail 2 .
 .It Dv CTLFLAG_SKIP
 When iterating the sysctl name space, do not list this sysctl.
 .It Dv CTLFLAG_TUN
 Advisory flag that a system tunable also exists for this variable.
 The initial sysctl value is tried fetched once from the system
 environment early during module load or system boot.
 .It Dv CTLFLAG_DYN
 Dynamically created OIDs automatically get this flag set.
 .It Dv CTLFLAG_VNET
 OID references a VIMAGE-enabled variable.
 .El
 .Sh EXAMPLES
 Sample use of
 .Fn SYSCTL_DECL
 to declare the
 .Va security
 sysctl tree for use by new nodes:
 .Bd -literal -offset indent
 SYSCTL_DECL(_security);
 .Ed
 .Pp
 Examples of integer, opaque, string, and procedure sysctls follow:
 .Bd -literal -offset indent
 /*
  * Example of a constant integer value.  Notice that the control
  * flags are CTLFLAG_RD, the variable pointer is SYSCTL_NULL_INT_PTR,
  * and the value is declared.
  */
 SYSCTL_INT(_debug_sizeof, OID_AUTO, bio, CTLFLAG_RD, SYSCTL_NULL_INT_PTR,
     sizeof(struct bio), "sizeof(struct bio)");
 
 /*
  * Example of a variable integer value.  Notice that the control
  * flags are CTLFLAG_RW, the variable pointer is set, and the
  * value is 0.
  */
 static int	doingcache = 1;		/* 1 => enable the cache */
 SYSCTL_INT(_debug, OID_AUTO, vfscache, CTLFLAG_RW, &doingcache, 0,
     "Enable name cache");
 
 /*
  * Example of a variable string value.  Notice that the control
  * flags are CTLFLAG_RW, that the variable pointer and string
  * size are set.  Unlike newer sysctls, this older sysctl uses a
  * static oid number.
  */
 char kernelname[MAXPATHLEN] = "/kernel";	/* XXX bloat */
 SYSCTL_STRING(_kern, KERN_BOOTFILE, bootfile, CTLFLAG_RW,
     kernelname, sizeof(kernelname), "Name of kernel file booted");
 
 /*
  * Example of an opaque data type exported by sysctl.  Notice that
  * the variable pointer and size are provided, as well as a format
  * string for sysctl(8).
  */
 static l_fp pps_freq;	/* scaled frequency offset (ns/s) */
 SYSCTL_OPAQUE(_kern_ntp_pll, OID_AUTO, pps_freq, CTLFLAG_RD,
     &pps_freq, sizeof(pps_freq), "I", "");
 
 /*
  * Example of a procedure based sysctl exporting string
  * information.  Notice that the data type is declared, the NULL
  * variable pointer and 0 size, the function pointer, and the
  * format string for sysctl(8).
  */
 SYSCTL_PROC(_kern_timecounter, OID_AUTO, hardware, CTLTYPE_STRING |
     CTLFLAG_RW, NULL, 0, sysctl_kern_timecounter_hardware, "A",
     "");
 .Ed
 .Pp
 The following is an example of
 how to create a new top-level category
 and how to hook up another subtree to an existing static node.
 This example does not use contexts,
 which results in tedious management of all intermediate oids,
 as they need to be freed later on:
 .Bd -literal -offset indent
 #include <sys/sysctl.h>
  ...
 /*
  * Need to preserve pointers to newly created subtrees,
  * to be able to free them later:
  */
 static struct sysctl_oid *root1;
 static struct sysctl_oid *root2;
 static struct sysctl_oid *oidp;
 static int a_int;
 static char *string = "dynamic sysctl";
  ...
 
 root1 = SYSCTL_ADD_ROOT_NODE(NULL,
 	OID_AUTO, "newtree", CTLFLAG_RW, 0, "new top level tree");
 oidp = SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(root1),
 	OID_AUTO, "newint", CTLFLAG_RW, &a_int, 0, "new int leaf");
  ...
 root2 = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(_debug),
 	OID_AUTO, "newtree", CTLFLAG_RW, 0, "new tree under debug");
 oidp = SYSCTL_ADD_STRING(NULL, SYSCTL_CHILDREN(root2),
 	OID_AUTO, "newstring", CTLFLAG_RD, string, 0, "new string leaf");
 .Ed
 .Pp
 This example creates the following subtrees:
 .Bd -literal -offset indent
 debug.newtree.newstring
 newtree.newint
 .Ed
 .Pp
 .Em "Care should be taken to free all OIDs once they are no longer needed!"
 .Sh SYSCTL NAMING
 When adding, modifying, or removing sysctl names, it is important to be
 aware that these interfaces may be used by users, libraries, applications,
 or documentation (such as published books), and are implicitly published application interfaces.
 As with other application interfaces, caution must be taken not to break
 existing applications, and to think about future use of new name spaces so as
 to avoid the need to rename or remove interfaces that might be depended on in
 the future.
 .Pp
 The semantics chosen for a new sysctl should be as clear as possible,
 and the name of the sysctl must closely reflect its semantics.
 Therefore the sysctl name deserves a fair amount of consideration.
 It should be short but yet representative of the sysctl meaning.
 If the name consists of several words, they should be separated by
 underscore characters, as in
 .Va compute_summary_at_mount .
 Underscore characters may be omitted only if the name consists of not more
 than two words, each being not longer than four characters, as in
 .Va bootfile .
 For boolean sysctls, negative logic should be totally avoided.
 That is, do not use names like
 .Va no_foobar
 or
 .Va foobar_disable .
 They are confusing and lead to configuration errors.
 Use positive logic instead:
 .Va foobar ,
 .Va foobar_enable .
 .Pp
 A temporary sysctl node OID that should not be relied upon must be designated
 as such by a leading underscore character in its name.
 For example:
 .Va _dirty_hack .
 .Sh SEE ALSO
 .Xr sysctl 3 ,
 .Xr sysctl 8 ,
 .Xr sysctl_add_oid 9 ,
 .Xr sysctl_ctx_free 9 ,
 .Xr sysctl_ctx_init 9 ,
 .Xr sysctl_remove_oid 9
 .Sh HISTORY
 The
 .Xr sysctl 8
 utility first appeared in
 .Bx 4.4 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Nm sysctl
 implementation originally found in
 .Bx
 has been extensively rewritten by
 .An Poul-Henning Kamp
 in order to add support for name lookups, name space iteration, and dynamic
 addition of MIB nodes.
 .Pp
 This man page was written by
 .An Robert N. M. Watson .
 .Sh SECURITY CONSIDERATIONS
 When creating new sysctls, careful attention should be paid to the security
 implications of the monitoring or management interface being created.
 Most sysctls present in the kernel are read-only or writable only by the
 superuser.
 Sysctls exporting extensive information on system data structures and
 operation, especially those implemented using procedures, will wish to
 implement access control to limit the undesired exposure of information about
 other processes, network connections, etc.
 .Pp
 The following top level sysctl name spaces are commonly used:
 .Bl -tag -width ".Va regression"
 .It Va compat
 Compatibility layer information.
 .It Va debug
 Debugging information.
 Various name spaces exist under
 .Va debug .
 .It Va hw
 Hardware and device driver information.
 .It Va kern
 Kernel behavior tuning; generally deprecated in favor of more specific
 name spaces.
 .It Va machdep
 Machine-dependent configuration parameters.
 .It Va net
 Network subsystem.
 Various protocols have name spaces under
 .Va net .
 .It Va regression
 Regression test configuration and information.
 .It Va security
 Security and security-policy configuration and information.
 .It Va sysctl
 Reserved name space for the implementation of sysctl.
 .It Va user
 Configuration settings relating to user application behavior.
 Generally, configuring applications using kernel sysctls is discouraged.
 .It Va vfs
 Virtual file system configuration and information.
 .It Va vm
 Virtual memory subsystem configuration and information.
 .El
Index: projects/clang800-import/share/mk/bsd.libnames.mk
===================================================================
--- projects/clang800-import/share/mk/bsd.libnames.mk	(revision 344548)
+++ projects/clang800-import/share/mk/bsd.libnames.mk	(revision 344549)
@@ -1,216 +1,215 @@
 # $FreeBSD$
 
 # The include file <bsd.libnames.mk> define library names.
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
 # file where necessary.
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.libnames.mk cannot be included directly.
 .endif
 
 LIBDESTDIR=	${SYSROOT:U${DESTDIR}}
 
 .sinclude <src.libnames.mk>
 
 # Src directory locations are also defined in src.libnames.mk.
 
 LIBCRT0?=	${LIBDESTDIR}${LIBDIR_BASE}/crt0.o
 
 LIB80211?=	${LIBDESTDIR}${LIBDIR_BASE}/lib80211.a
 LIBALIAS?=	${LIBDESTDIR}${LIBDIR_BASE}/libalias.a
 LIBARCHIVE?=	${LIBDESTDIR}${LIBDIR_BASE}/libarchive.a
 LIBASN1?=	${LIBDESTDIR}${LIBDIR_BASE}/libasn1.a
 LIBATM?=	${LIBDESTDIR}${LIBDIR_BASE}/libatm.a
 LIBAUDITD?=	${LIBDESTDIR}${LIBDIR_BASE}/libauditd.a
 LIBAVL?=	${LIBDESTDIR}${LIBDIR_BASE}/libavl.a
 LIBBE?=		${LIBDESTDIR}${LIBDIR_BASE}/libbe.a
 LIBBEGEMOT?=	${LIBDESTDIR}${LIBDIR_BASE}/libbegemot.a
 LIBBLACKLIST?=	${LIBDESTDIR}${LIBDIR_BASE}/libblacklist.a
 LIBBLUETOOTH?=	${LIBDESTDIR}${LIBDIR_BASE}/libbluetooth.a
 LIBBSDXML?=	${LIBDESTDIR}${LIBDIR_BASE}/libbsdxml.a
 LIBBSM?=	${LIBDESTDIR}${LIBDIR_BASE}/libbsm.a
 LIBBSNMP?=	${LIBDESTDIR}${LIBDIR_BASE}/libbsnmp.a
 LIBBZ2?=	${LIBDESTDIR}${LIBDIR_BASE}/libbz2.a
 LIBC?=		${LIBDESTDIR}${LIBDIR_BASE}/libc.a
 LIBCALENDAR?=	${LIBDESTDIR}${LIBDIR_BASE}/libcalendar.a
 LIBCAM?=	${LIBDESTDIR}${LIBDIR_BASE}/libcam.a
 LIBCOMPAT?=	${LIBDESTDIR}${LIBDIR_BASE}/libcompat.a
 LIBCOMPILER_RT?=${LIBDESTDIR}${LIBDIR_BASE}/libcompiler_rt.a
 LIBCOM_ERR?=	${LIBDESTDIR}${LIBDIR_BASE}/libcom_err.a
 LIBCPLUSPLUS?=	${LIBDESTDIR}${LIBDIR_BASE}/libc++.a
 LIBCRYPT?=	${LIBDESTDIR}${LIBDIR_BASE}/libcrypt.a
 LIBCRYPTO?=	${LIBDESTDIR}${LIBDIR_BASE}/libcrypto.a
 LIBCTF?=	${LIBDESTDIR}${LIBDIR_BASE}/libctf.a
 LIBCURSES?=	${LIBDESTDIR}${LIBDIR_BASE}/libcurses.a
 LIBCUSE?=	${LIBDESTDIR}${LIBDIR_BASE}/libcuse.a
 LIBCXGB4?=	${LIBDESTDIR}${LIBDIR_BASE}/libcxgb4.a
 LIBCXXRT?=	${LIBDESTDIR}${LIBDIR_BASE}/libcxxrt.a
 LIBC_PIC?=	${LIBDESTDIR}${LIBDIR_BASE}/libc_pic.a
 LIBDEVCTL?=	${LIBDESTDIR}${LIBDIR_BASE}/libdevctl.a
 LIBDEVDCTL?=	${LIBDESTDIR}${LIBDIR_BASE}/libdevdctl.a
 LIBDEVINFO?=	${LIBDESTDIR}${LIBDIR_BASE}/libdevinfo.a
 LIBDEVSTAT?=	${LIBDESTDIR}${LIBDIR_BASE}/libdevstat.a
 LIBDIALOG?=	${LIBDESTDIR}${LIBDIR_BASE}/libdialog.a
 LIBDL?=		${LIBDESTDIR}${LIBDIR_BASE}/libdl.a
 LIBDNS?=	${LIBDESTDIR}${LIBDIR_BASE}/libdns.a
 LIBDPV?=	${LIBDESTDIR}${LIBDIR_BASE}/libdpv.a
 LIBDTRACE?=	${LIBDESTDIR}${LIBDIR_BASE}/libdtrace.a
 LIBDWARF?=	${LIBDESTDIR}${LIBDIR_BASE}/libdwarf.a
 LIBEDIT?=	${LIBDESTDIR}${LIBDIR_BASE}/libedit.a
 LIBEFIVAR?=	${LIBDESTDIR}${LIBDIR_BASE}/libefivar.a
 LIBELF?=	${LIBDESTDIR}${LIBDIR_BASE}/libelf.a
 LIBEXECINFO?=	${LIBDESTDIR}${LIBDIR_BASE}/libexecinfo.a
 LIBFETCH?=	${LIBDESTDIR}${LIBDIR_BASE}/libfetch.a
 LIBFIGPAR?=	${LIBDESTDIR}${LIBDIR_BASE}/libfigpar.a
 LIBFL?=		"don't use LIBFL, use LIBL"
 LIBFORM?=	${LIBDESTDIR}${LIBDIR_BASE}/libform.a
 LIBG2C?=	${LIBDESTDIR}${LIBDIR_BASE}/libg2c.a
 LIBGEOM?=	${LIBDESTDIR}${LIBDIR_BASE}/libgeom.a
 LIBGNUREGEX?=	${LIBDESTDIR}${LIBDIR_BASE}/libgnuregex.a
 LIBGPIO?=	${LIBDESTDIR}${LIBDIR_BASE}/libgpio.a
 LIBGSSAPI?=	${LIBDESTDIR}${LIBDIR_BASE}/libgssapi.a
 LIBGSSAPI_KRB5?= ${LIBDESTDIR}${LIBDIR_BASE}/libgssapi_krb5.a
 LIBHDB?=	${LIBDESTDIR}${LIBDIR_BASE}/libhdb.a
 LIBHEIMBASE?=	${LIBDESTDIR}${LIBDIR_BASE}/libheimbase.a
 LIBHEIMNTLM?=	${LIBDESTDIR}${LIBDIR_BASE}/libheimntlm.a
 LIBHEIMSQLITE?=	${LIBDESTDIR}${LIBDIR_BASE}/libheimsqlite.a
 LIBHX509?=	${LIBDESTDIR}${LIBDIR_BASE}/libhx509.a
 LIBIBCM?=	${LIBDESTDIR}${LIBDIR_BASE}/libibcm.a
 LIBIBMAD?=	${LIBDESTDIR}${LIBDIR_BASE}/libibmad.a
 LIBIBNETDISC?=	${LIBDESTDIR}${LIBDIR_BASE}/libibnetdisc.a
 LIBIBUMAD?=	${LIBDESTDIR}${LIBDIR_BASE}/libibumad.a
 LIBIBVERBS?=	${LIBDESTDIR}${LIBDIR_BASE}/libibverbs.a
-LIBIFCONFIG?=	${LIBDESTDIR}${LIBDIR_BASE}/libifconfig.a
 LIBIPSEC?=	${LIBDESTDIR}${LIBDIR_BASE}/libipsec.a
 LIBIPT?=	${LIBDESTDIR}${LIBDIR_BASE}/libipt.a
 LIBJAIL?=	${LIBDESTDIR}${LIBDIR_BASE}/libjail.a
 LIBKADM5CLNT?=	${LIBDESTDIR}${LIBDIR_BASE}/libkadm5clnt.a
 LIBKADM5SRV?=	${LIBDESTDIR}${LIBDIR_BASE}/libkadm5srv.a
 LIBKAFS5?=	${LIBDESTDIR}${LIBDIR_BASE}/libkafs5.a
 LIBKDC?=	${LIBDESTDIR}${LIBDIR_BASE}/libkdc.a
 LIBKEYCAP?=	${LIBDESTDIR}${LIBDIR_BASE}/libkeycap.a
 LIBKICONV?=	${LIBDESTDIR}${LIBDIR_BASE}/libkiconv.a
 LIBKRB5?=	${LIBDESTDIR}${LIBDIR_BASE}/libkrb5.a
 LIBKVM?=	${LIBDESTDIR}${LIBDIR_BASE}/libkvm.a
 LIBL?=		${LIBDESTDIR}${LIBDIR_BASE}/libl.a
 LIBLN?=		"don't use LIBLN, use LIBL"
 LIBLZMA?=	${LIBDESTDIR}${LIBDIR_BASE}/liblzma.a
 LIBM?=		${LIBDESTDIR}${LIBDIR_BASE}/libm.a
 LIBMAGIC?=	${LIBDESTDIR}${LIBDIR_BASE}/libmagic.a
 LIBMD?=		${LIBDESTDIR}${LIBDIR_BASE}/libmd.a
 LIBMEMSTAT?=	${LIBDESTDIR}${LIBDIR_BASE}/libmemstat.a
 LIBMENU?=	${LIBDESTDIR}${LIBDIR_BASE}/libmenu.a
 LIBMILTER?=	${LIBDESTDIR}${LIBDIR_BASE}/libmilter.a
 LIBMLX4?=	${LIBDESTDIR}${LIBDIR_BASE}/libmlx4.a
 LIBMLX5?=	${LIBDESTDIR}${LIBDIR_BASE}/libmlx5.a
 LIBMP?=		${LIBDESTDIR}${LIBDIR_BASE}/libmp.a
 LIBMT?=		${LIBDESTDIR}${LIBDIR_BASE}/libmt.a
 LIBNANDFS?=	${LIBDESTDIR}${LIBDIR_BASE}/libnandfs.a
 LIBNCURSES?=	${LIBDESTDIR}${LIBDIR_BASE}/libncurses.a
 LIBNCURSESW?=	${LIBDESTDIR}${LIBDIR_BASE}/libncursesw.a
 LIBNETGRAPH?=	${LIBDESTDIR}${LIBDIR_BASE}/libnetgraph.a
 LIBNGATM?=	${LIBDESTDIR}${LIBDIR_BASE}/libngatm.a
 LIBNV?=		${LIBDESTDIR}${LIBDIR_BASE}/libnv.a
 LIBNVPAIR?=	${LIBDESTDIR}${LIBDIR_BASE}/libnvpair.a
 LIBOPENCSD?=	${LIBDESTDIR}${LIBDIR_BASE}/libopencsd.a
 LIBOPENSM?=	${LIBDESTDIR}${LIBDIR_BASE}/libopensm.a
 LIBOPIE?=	${LIBDESTDIR}${LIBDIR_BASE}/libopie.a
 LIBOSMCOMP?=	${LIBDESTDIR}${LIBDIR_BASE}/libosmcomp.a
 LIBOSMVENDOR?=	${LIBDESTDIR}${LIBDIR_BASE}/libosmvendor.a
 LIBPAM?=	${LIBDESTDIR}${LIBDIR_BASE}/libpam.a
 LIBPANEL?=	${LIBDESTDIR}${LIBDIR_BASE}/libpanel.a
 LIBPANELW?=	${LIBDESTDIR}${LIBDIR_BASE}/libpanelw.a
 LIBPCAP?=	${LIBDESTDIR}${LIBDIR_BASE}/libpcap.a
 LIBPJDLOG?=	${LIBDESTDIR}${LIBDIR_BASE}/libpjdlog.a
 LIBPMC?=	${LIBDESTDIR}${LIBDIR_BASE}/libpmc.a
 LIBPROC?=	${LIBDESTDIR}${LIBDIR_BASE}/libproc.a
 LIBPROCSTAT?=	${LIBDESTDIR}${LIBDIR_BASE}/libprocstat.a
 LIBPTHREAD?=	${LIBDESTDIR}${LIBDIR_BASE}/libpthread.a
 LIBRADIUS?=	${LIBDESTDIR}${LIBDIR_BASE}/libradius.a
 LIBRDMACM?=	${LIBDESTDIR}${LIBDIR_BASE}/librdmacm.a
 LIBREGEX?=	${LIBDESTDIR}${LIBDIR_BASE}/libregex.a
 LIBROKEN?=	${LIBDESTDIR}${LIBDIR_BASE}/libroken.a
 LIBRPCSEC_GSS?=	${LIBDESTDIR}${LIBDIR_BASE}/librpcsec_gss.a
 LIBRPCSVC?=	${LIBDESTDIR}${LIBDIR_BASE}/librpcsvc.a
 LIBRT?=		${LIBDESTDIR}${LIBDIR_BASE}/librt.a
 LIBRTLD_DB?=	${LIBDESTDIR}${LIBDIR_BASE}/librtld_db.a
 LIBSBUF?=	${LIBDESTDIR}${LIBDIR_BASE}/libsbuf.a
 LIBSDP?=	${LIBDESTDIR}${LIBDIR_BASE}/libsdp.a
 LIBSMB?=	${LIBDESTDIR}${LIBDIR_BASE}/libsmb.a
 LIBSSL?=	${LIBDESTDIR}${LIBDIR_BASE}/libssl.a
 LIBSSP_NONSHARED?=	${LIBDESTDIR}${LIBDIR_BASE}/libssp_nonshared.a
 LIBSTDCPLUSPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstdc++.a
 LIBSTDTHREADS?=	${LIBDESTDIR}${LIBDIR_BASE}/libstdthreads.a
 LIBSYSDECODE?=	${LIBDESTDIR}${LIBDIR_BASE}/libsysdecode.a
 LIBTACPLUS?=	${LIBDESTDIR}${LIBDIR_BASE}/libtacplus.a
 LIBTERMCAP?=	${LIBDESTDIR}${LIBDIR_BASE}/libtermcap.a
 LIBTERMCAPW?=	${LIBDESTDIR}${LIBDIR_BASE}/libtermcapw.a
 LIBTERMLIB?=	"don't use LIBTERMLIB, use LIBTERMCAP"
 LIBTINFO?=	"don't use LIBTINFO, use LIBNCURSES"
 LIBUFS?=	${LIBDESTDIR}${LIBDIR_BASE}/libufs.a
 LIBUGIDFW?=	${LIBDESTDIR}${LIBDIR_BASE}/libugidfw.a
 LIBULOG?=	${LIBDESTDIR}${LIBDIR_BASE}/libulog.a
 LIBUMEM?=	${LIBDESTDIR}${LIBDIR_BASE}/libumem.a
 LIBUSB?=	${LIBDESTDIR}${LIBDIR_BASE}/libusb.a
 LIBUSBHID?=	${LIBDESTDIR}${LIBDIR_BASE}/libusbhid.a
 LIBUTIL?=	${LIBDESTDIR}${LIBDIR_BASE}/libutil.a
 LIBUUTIL?=	${LIBDESTDIR}${LIBDIR_BASE}/libuutil.a
 LIBVGL?=	${LIBDESTDIR}${LIBDIR_BASE}/libvgl.a
 LIBVMMAPI?=	${LIBDESTDIR}${LIBDIR_BASE}/libvmmapi.a
 LIBWIND?=	${LIBDESTDIR}${LIBDIR_BASE}/libwind.a
 LIBWRAP?=	${LIBDESTDIR}${LIBDIR_BASE}/libwrap.a
 LIBXO?=		${LIBDESTDIR}${LIBDIR_BASE}/libxo.a
 LIBXPG4?=	${LIBDESTDIR}${LIBDIR_BASE}/libxpg4.a
 LIBY?=		${LIBDESTDIR}${LIBDIR_BASE}/liby.a
 LIBYPCLNT?=	${LIBDESTDIR}${LIBDIR_BASE}/libypclnt.a
 LIBZ?=		${LIBDESTDIR}${LIBDIR_BASE}/libz.a
 LIBZFS?=	${LIBDESTDIR}${LIBDIR_BASE}/libzfs.a
 LIBZFS_CORE?=	${LIBDESTDIR}${LIBDIR_BASE}/libzfs_core.a
 LIBZPOOL?=	${LIBDESTDIR}${LIBDIR_BASE}/libzpool.a
 
 # enforce the 2 -lpthread and -lc to always be the last in that exact order
 .if defined(LDADD)
 .if ${LDADD:M-lpthread}
 LDADD:=	${LDADD:N-lpthread} -lpthread
 .endif
 .if ${LDADD:M-lc}
 LDADD:=	${LDADD:N-lc} -lc
 .endif
 .endif
 
 # Only do this for src builds.
 .if defined(SRCTOP)
 .if defined(_LIBRARIES) && defined(LIB) && \
     ${_LIBRARIES:M${LIB}} != ""
 .if !defined(LIB${LIB:tu})
 .error ${.CURDIR}: Missing value for LIB${LIB:tu} in ${_this:T}.  Likely should be: LIB${LIB:tu}?= $${LIBDESTDIR}$${LIBDIR_BASE}/lib${LIB}.a
 .endif
 .endif
 
 # Derive LIB*SRCDIR from LIB*DIR
 .for lib in ${_LIBRARIES}
 LIB${lib:tu}SRCDIR?=	${SRCTOP}/${LIB${lib:tu}DIR:S,^${OBJTOP}/,,}
 .endfor
 .else
 
 # Out of tree builds
 
 # There are LIBADD defined in an out-of-tree build.  Are they *all*
 # in-tree libraries?  If so convert them to LDADD to support
 # partial checkouts.
 .if !empty(LIBADD)
 _convert_libadd=	1
 .for l in ${LIBADD}
 .if empty(LIB${l:tu})
 _convert_libadd=	0
 .endif
 .endfor
 .if ${_convert_libadd} == 1
 .warning Converting out-of-tree build LIBADDs into LDADD.  This is not fully supported.
 .for l in ${LIBADD}
 LDADD+=	-l${l}
 .endfor
 .endif
 .endif
 
 .endif	# defined(SRCTOP)
Index: projects/clang800-import/share/mk/src.libnames.mk
===================================================================
--- projects/clang800-import/share/mk/src.libnames.mk	(revision 344548)
+++ projects/clang800-import/share/mk/src.libnames.mk	(revision 344549)
@@ -1,611 +1,614 @@
 # $FreeBSD$
 #
 # The include file <src.libnames.mk> define library names suitable
 # for INTERNALLIB and PRIVATELIB definition
 
 .if !target(__<bsd.init.mk>__)
 .error src.libnames.mk cannot be included directly.
 .endif
 
 .if !target(__<src.libnames.mk>__)
 __<src.libnames.mk>__:
 
 .include <src.opts.mk>
 
 _PRIVATELIBS=	\
 		atf_c \
 		atf_cxx \
 		bsdstat \
 		devdctl \
 		event \
 		heimipcc \
 		heimipcs \
-		ifconfig \
 		ldns \
 		sqlite3 \
 		ssh \
 		ucl \
 		unbound \
 		zstd
 
 _INTERNALLIBS=	\
 		amu \
 		bsnmptools \
 		c_nossp_pic \
 		cron \
 		elftc \
 		fifolog \
+		ifconfig \
 		ipf \
 		lpr \
 		netbsd \
 		ntp \
 		ntpevent \
 		openbsd \
 		opts \
 		parse \
 		pe \
 		pmcstat \
 		sl \
 		sm \
 		smdb \
 		smutil \
 		telnet \
 		vers
 
 _LIBRARIES=	\
 		${_PRIVATELIBS} \
 		${_INTERNALLIBS} \
 		${LOCAL_LIBRARIES} \
 		80211 \
 		alias \
 		archive \
 		asn1 \
 		auditd \
 		avl \
 		be \
 		begemot \
 		bluetooth \
 		bsdxml \
 		bsm \
 		bsnmp \
 		bz2 \
 		c \
 		c_pic \
 		calendar \
 		cam \
 		casper \
 		cap_dns \
 		cap_fileargs \
 		cap_grp \
 		cap_pwd \
 		cap_random \
 		cap_sysctl \
 		cap_syslog \
 		com_err \
 		compiler_rt \
 		crypt \
 		crypto \
 		ctf \
 		cuse \
 		cxxrt \
 		devctl \
 		devdctl \
 		devinfo \
 		devstat \
 		dialog \
 		dl \
 		dpv \
 		dtrace \
 		dwarf \
 		edit \
 		efivar \
 		elf \
 		execinfo \
 		fetch \
 		figpar \
 		geom \
 		gnuregex \
 		gpio \
 		gssapi \
 		gssapi_krb5 \
 		hdb \
 		heimbase \
 		heimntlm \
 		heimsqlite \
 		hx509 \
 		ipsec \
 		ipt \
 		jail \
 		kadm5clnt \
 		kadm5srv \
 		kafs5 \
 		kdc \
 		kiconv \
 		krb5 \
 		kvm \
 		l \
 		lzma \
 		m \
 		magic \
 		md \
 		memstat \
 		mp \
 		mt \
 		nandfs \
 		ncurses \
 		ncursesw \
 		netgraph \
 		ngatm \
 		nv \
 		nvpair \
 		opencsd \
 		opie \
 		pam \
 		panel \
 		panelw \
 		pcap \
 		pcsclite \
 		pjdlog \
 		pmc \
 		proc \
 		procstat \
 		pthread \
 		radius \
 		regex \
 		roken \
 		rpcsec_gss \
 		rpcsvc \
 		rt \
 		rtld_db \
 		sbuf \
 		sdp \
 		sm \
 		smb \
 		ssl \
 		ssp_nonshared \
 		stdthreads \
 		supcplusplus \
 		sysdecode \
 		tacplus \
 		termcap \
 		termcapw \
 		ufs \
 		ugidfw \
 		ulog \
 		umem \
 		usb \
 		usbhid \
 		util \
 		uutil \
 		vmmapi \
 		wind \
 		wrap \
 		xo \
 		y \
 		ypclnt \
 		z \
 		zfs_core \
 		zfs \
 		zpool \
 
 .if ${MK_BLACKLIST} != "no"
 _LIBRARIES+= \
 		blacklist \
 
 .endif
 
 .if ${MK_OFED} != "no"
 _LIBRARIES+= \
 		cxgb4 \
 		ibcm \
 		ibmad \
 		ibnetdisc \
 		ibumad \
 		ibverbs \
 		mlx4 \
 		mlx5 \
 		rdmacm \
 		osmcomp \
 		opensm \
 		osmvendor
 .endif
 
 # Each library's LIBADD needs to be duplicated here for static linkage of
 # 2nd+ order consumers.  Auto-generating this would be better.
 _DP_80211=	sbuf bsdxml
 _DP_archive=	z bz2 lzma bsdxml
 _DP_zstd=	pthread
 .if ${MK_BLACKLIST} != "no"
 _DP_blacklist+=	pthread
 .endif
 _DP_crypto=	pthread
 .if ${MK_OPENSSL} != "no"
 _DP_archive+=	crypto
 .else
 _DP_archive+=	md
 .endif
 _DP_sqlite3=	pthread
 _DP_ssl=	crypto
 _DP_ssh=	crypto crypt z
 .if ${MK_LDNS} != "no"
 _DP_ssh+=	ldns
 .endif
 _DP_edit=	ncursesw
 .if ${MK_OPENSSL} != "no"
 _DP_bsnmp=	crypto
 .endif
 _DP_geom=	bsdxml sbuf
 _DP_cam=	sbuf
 _DP_kvm=	elf
 _DP_casper=	nv
 _DP_cap_dns=	nv
 _DP_cap_fileargs=	nv
 _DP_cap_grp=	nv
 _DP_cap_pwd=	nv
 _DP_cap_random=	nv
 _DP_cap_sysctl=	nv
 _DP_cap_syslog=	nv
 .if ${MK_OFED} != "no"
 _DP_pcap=	ibverbs mlx5
 .endif
 _DP_pjdlog=	util
 _DP_opie=	md
 _DP_usb=	pthread
 _DP_unbound=	ssl crypto pthread
 _DP_rt=	pthread
 .if ${MK_OPENSSL} == "no"
 _DP_radius=	md
 .else
 _DP_radius=	crypto
 .endif
 _DP_rtld_db=	elf procstat
 _DP_procstat=	kvm util elf
 .if ${MK_CXX} == "yes"
 .if ${MK_LIBCPLUSPLUS} != "no"
 _DP_proc=	cxxrt
 .else
 _DP_proc=	supcplusplus
 .endif
 .endif
 .if ${MK_CDDL} != "no"
 _DP_proc+=	ctf
 .endif
 _DP_proc+=	elf procstat rtld_db util
 _DP_mp=	crypto
 _DP_memstat=	kvm
 _DP_magic=	z
 _DP_mt=		sbuf bsdxml
 _DP_ldns=	ssl crypto
 .if ${MK_OPENSSL} != "no"
 _DP_fetch=	ssl crypto
 .else
 _DP_fetch=	md
 .endif
 _DP_execinfo=	elf
 _DP_dwarf=	elf
 _DP_dpv=	dialog figpar util ncursesw
 _DP_dialog=	ncursesw m
 _DP_cuse=	pthread
 _DP_atf_cxx=	atf_c
 _DP_devstat=	kvm
 _DP_pam=	radius tacplus opie md util
 .if ${MK_KERBEROS} != "no"
 _DP_pam+=	krb5
 .endif
 .if ${MK_OPENSSH} != "no"
 _DP_pam+=	ssh
 .endif
 .if ${MK_NIS} != "no"
 _DP_pam+=	ypclnt
 .endif
 _DP_roken=	crypt
 _DP_kadm5clnt=	com_err krb5 roken
 _DP_kadm5srv=	com_err hdb krb5 roken
 _DP_heimntlm=	crypto com_err krb5 roken
 _DP_hx509=	asn1 com_err crypto roken wind
 _DP_hdb=	asn1 com_err krb5 roken sqlite3
 _DP_asn1=	com_err roken
 _DP_kdc=	roken hdb hx509 krb5 heimntlm asn1 crypto
 _DP_wind=	com_err roken
 _DP_heimbase=	pthread
 _DP_heimipcc=	heimbase roken pthread
 _DP_heimipcs=	heimbase roken pthread
 _DP_kafs5=	asn1 krb5 roken
 _DP_krb5+=	asn1 com_err crypt crypto hx509 roken wind heimbase heimipcc
 _DP_gssapi_krb5+=	gssapi krb5 crypto roken asn1 com_err
 _DP_lzma=	pthread
 _DP_ucl=	m
 _DP_vmmapi=	util
 _DP_opencsd=	cxxrt
 _DP_ctf=	z
 _DP_dtrace=	ctf elf proc pthread rtld_db
 _DP_xo=		util
 # The libc dependencies are not strictly needed but are defined to make the
 # assert happy.
 _DP_c=		compiler_rt
 .if ${MK_SSP} != "no"
 _DP_c+=		ssp_nonshared
 .endif
 _DP_stdthreads=	pthread
 _DP_tacplus=	md
 _DP_panel=	ncurses
 _DP_panelw=	ncursesw
 _DP_rpcsec_gss=	gssapi
 _DP_smb=	kiconv
 _DP_ulog=	md
 _DP_fifolog=	z
 _DP_ipf=	kvm
 _DP_zfs=	md pthread umem util uutil m nvpair avl bsdxml geom nvpair z \
 		zfs_core
 _DP_zfs_core=	nvpair
 _DP_zpool=	md pthread z nvpair avl umem
 _DP_be=		zfs nvpair
 
 # OFED support
 .if ${MK_OFED} != "no"
 _DP_cxgb4=	ibverbs pthread
 _DP_ibcm=	ibverbs
 _DP_ibmad=	ibumad
 _DP_ibnetdisc=	osmcomp ibmad ibumad
 _DP_ibumad=	
 _DP_ibverbs=
 _DP_mlx4=	ibverbs pthread
 _DP_mlx5=	ibverbs pthread
 _DP_rdmacm=	ibverbs
 _DP_osmcomp=	pthread
 _DP_opensm=	pthread
 _DP_osmvendor=	ibumad pthread
 .endif
 
 # Define special cases
 LDADD_supcplusplus=	-lsupc++
 LIBATF_C=	${LIBDESTDIR}${LIBDIR_BASE}/libprivateatf-c.a
 LIBATF_CXX=	${LIBDESTDIR}${LIBDIR_BASE}/libprivateatf-c++.a
 LDADD_atf_c=	-lprivateatf-c
 LDADD_atf_cxx=	-lprivateatf-c++
 
 .for _l in ${_PRIVATELIBS}
 LIB${_l:tu}?=	${LIBDESTDIR}${LIBDIR_BASE}/libprivate${_l}.a
 .endfor
 
 .if ${MK_PIE} != "no"
 PIE_SUFFIX=	_pie
 .endif
 
 .for _l in ${_LIBRARIES}
 .if ${_INTERNALLIBS:M${_l}} || !defined(SYSROOT)
 LDADD_${_l}_L+=		-L${LIB${_l:tu}DIR}
 .endif
 DPADD_${_l}?=	${LIB${_l:tu}}
 .if ${_PRIVATELIBS:M${_l}}
 LDADD_${_l}?=	-lprivate${_l}
 .elif ${_INTERNALLIBS:M${_l}}
 LDADD_${_l}?=	${LDADD_${_l}_L} -l${_l:S/${PIE_SUFFIX}//}${PIE_SUFFIX}
 .else
 LDADD_${_l}?=	${LDADD_${_l}_L} -l${_l}
 .endif
 # Add in all dependencies for static linkage.
 .if defined(_DP_${_l}) && (${_INTERNALLIBS:M${_l}} || \
     (defined(NO_SHARED) && ${NO_SHARED:tl} != "no"))
 .for _d in ${_DP_${_l}}
 DPADD_${_l}+=	${DPADD_${_d}}
 LDADD_${_l}+=	${LDADD_${_d}}
 .endfor
 .endif
 .endfor
 
 # These are special cases where the library is broken and anything that uses
 # it needs to add more dependencies.  Broken usually means that it has a
 # cyclic dependency and cannot link its own dependencies.  This is bad, please
 # fix the library instead.
 # Unless the library itself is broken then the proper place to define
 # dependencies is _DP_* above.
 
 # libatf-c++ exposes libatf-c abi hence we need to explicit link to atf_c for
 # atf_cxx
 DPADD_atf_cxx+=	${DPADD_atf_c}
 LDADD_atf_cxx+=	${LDADD_atf_c}
 
 # Detect LDADD/DPADD that should be LIBADD, before modifying LDADD here.
 _BADLDADD=
 .for _l in ${LDADD:M-l*:N-l*/*:C,^-l,,}
 .if ${_LIBRARIES:M${_l}} && !${_PRIVATELIBS:M${_l}}
 _BADLDADD+=	${_l}
 .endif
 .endfor
 .if !empty(_BADLDADD)
 .error ${.CURDIR}: These libraries should be LIBADD+=foo rather than DPADD/LDADD+=-lfoo: ${_BADLDADD}
 .endif
 
 .for _l in ${LIBADD}
 DPADD+=		${DPADD_${_l}}
 LDADD+=		${LDADD_${_l}}
 .endfor
 
 # INTERNALLIB definitions.
 LIBELFTCDIR=	${OBJTOP}/lib/libelftc
 LIBELFTC?=	${LIBELFTCDIR}/libelftc${PIE_SUFFIX}.a
 
 LIBPEDIR=	${OBJTOP}/lib/libpe
 LIBPE?=		${LIBPEDIR}/libpe${PIE_SUFFIX}.a
 
 LIBOPENBSDDIR=	${OBJTOP}/lib/libopenbsd
 LIBOPENBSD?=	${LIBOPENBSDDIR}/libopenbsd${PIE_SUFFIX}.a
 
 LIBSMDIR=	${OBJTOP}/lib/libsm
 LIBSM?=		${LIBSMDIR}/libsm${PIE_SUFFIX}.a
 
 LIBSMDBDIR=	${OBJTOP}/lib/libsmdb
 LIBSMDB?=	${LIBSMDBDIR}/libsmdb${PIE_SUFFIX}.a
 
 LIBSMUTILDIR=	${OBJTOP}/lib/libsmutil
 LIBSMUTIL?=	${LIBSMUTILDIR}/libsmutil${PIE_SUFFIX}.a
 
 LIBNETBSDDIR?=	${OBJTOP}/lib/libnetbsd
 LIBNETBSD?=	${LIBNETBSDDIR}/libnetbsd${PIE_SUFFIX}.a
 
 LIBVERSDIR?=	${OBJTOP}/kerberos5/lib/libvers
 LIBVERS?=	${LIBVERSDIR}/libvers${PIE_SUFFIX}.a
 
 LIBSLDIR=	${OBJTOP}/kerberos5/lib/libsl
 LIBSL?=		${LIBSLDIR}/libsl${PIE_SUFFIX}.a
+
+LIBIFCONFIGDIR=	${OBJTOP}/lib/libifconfig
+LIBIFCONFIG?=	${LIBIFCONFIGDIR}/libifconfig${PIE_SUFFIX}.a
 
 LIBIPFDIR=	${OBJTOP}/sbin/ipf/libipf
 LIBIPF?=	${LIBIPFDIR}/libipf${PIE_SUFFIX}.a
 
 LIBTELNETDIR=	${OBJTOP}/lib/libtelnet
 LIBTELNET?=	${LIBTELNETDIR}/libtelnet${PIE_SUFFIX}.a
 
 LIBCRONDIR=	${OBJTOP}/usr.sbin/cron/lib
 LIBCRON?=	${LIBCRONDIR}/libcron${PIE_SUFFIX}.a
 
 LIBNTPDIR=	${OBJTOP}/usr.sbin/ntp/libntp
 LIBNTP?=	${LIBNTPDIR}/libntp${PIE_SUFFIX}.a
 
 LIBNTPEVENTDIR=	${OBJTOP}/usr.sbin/ntp/libntpevent
 LIBNTPEVENT?=	${LIBNTPEVENTDIR}/libntpevent${PIE_SUFFIX}.a
 
 LIBOPTSDIR=	${OBJTOP}/usr.sbin/ntp/libopts
 LIBOPTS?=	${LIBOPTSDIR}/libopts${PIE_SUFFIX}.a
 
 LIBPARSEDIR=	${OBJTOP}/usr.sbin/ntp/libparse
 LIBPARSE?=	${LIBPARSEDIR}/libparse${PIE_SUFFIX}.a
 
 LIBLPRDIR=	${OBJTOP}/usr.sbin/lpr/common_source
 LIBLPR?=	${LIBLPRDIR}/liblpr${PIE_SUFFIX}.a
 
 LIBFIFOLOGDIR=	${OBJTOP}/usr.sbin/fifolog/lib
 LIBFIFOLOG?=	${LIBFIFOLOGDIR}/libfifolog${PIE_SUFFIX}.a
 
 LIBBSNMPTOOLSDIR=	${OBJTOP}/usr.sbin/bsnmpd/tools/libbsnmptools
 LIBBSNMPTOOLS?=	${LIBBSNMPTOOLSDIR}/libbsnmptools${PIE_SUFFIX}.a
 
 LIBAMUDIR=	${OBJTOP}/usr.sbin/amd/libamu
 LIBAMU?=	${LIBAMUDIR}/libamu${PIE_SUFFIX}.a
 
 LIBBE?=		${LIBBEDIR}/libbe${PIE_SUFFIX}.a
 
 LIBPMCSTATDIR=	${OBJTOP}/lib/libpmcstat
 LIBPMCSTAT?=	${LIBPMCSTATDIR}/libpmcstat${PIE_SUFFIX}.a
 
 LIBC_NOSSP_PICDIR=	${OBJTOP}/lib/libc
 LIBC_NOSSP_PIC?=	${LIBC_NOSSP_PICDIR}/libc_nossp_pic.a
 
 # Define a directory for each library.  This is useful for adding -L in when
 # not using a --sysroot or for meta mode bootstrapping when there is no
 # Makefile.depend.  These are sorted by directory.
 LIBAVLDIR=	${OBJTOP}/cddl/lib/libavl
 LIBCTFDIR=	${OBJTOP}/cddl/lib/libctf
 LIBDTRACEDIR=	${OBJTOP}/cddl/lib/libdtrace
 LIBNVPAIRDIR=	${OBJTOP}/cddl/lib/libnvpair
 LIBUMEMDIR=	${OBJTOP}/cddl/lib/libumem
 LIBUUTILDIR=	${OBJTOP}/cddl/lib/libuutil
 LIBZFSDIR=	${OBJTOP}/cddl/lib/libzfs
 LIBZFS_COREDIR=	${OBJTOP}/cddl/lib/libzfs_core
 LIBZPOOLDIR=	${OBJTOP}/cddl/lib/libzpool
 
 # OFED support
 LIBCXGB4DIR=	${OBJTOP}/lib/ofed/libcxgb4
 LIBIBCMDIR=	${OBJTOP}/lib/ofed/libibcm
 LIBIBMADDIR=	${OBJTOP}/lib/ofed/libibmad
 LIBIBNETDISCDIR=${OBJTOP}/lib/ofed/libibnetdisc
 LIBIBUMADDIR=	${OBJTOP}/lib/ofed/libibumad
 LIBIBVERBSDIR=	${OBJTOP}/lib/ofed/libibverbs
 LIBMLX4DIR=	${OBJTOP}/lib/ofed/libmlx4
 LIBMLX5DIR=	${OBJTOP}/lib/ofed/libmlx5
 LIBRDMACMDIR=	${OBJTOP}/lib/ofed/librdmacm
 LIBOSMCOMPDIR=	${OBJTOP}/lib/ofed/complib
 LIBOPENSMDIR=	${OBJTOP}/lib/ofed/libopensm
 LIBOSMVENDORDIR=${OBJTOP}/lib/ofed/libvendor
 
 LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialog
 LIBGCOVDIR=	${OBJTOP}/gnu/lib/libgcov
 LIBGOMPDIR=	${OBJTOP}/gnu/lib/libgomp
 LIBGNUREGEXDIR=	${OBJTOP}/gnu/lib/libregex
 LIBSSPDIR=	${OBJTOP}/gnu/lib/libssp
 LIBSSP_NONSHAREDDIR=	${OBJTOP}/gnu/lib/libssp/libssp_nonshared
 LIBSUPCPLUSPLUSDIR=	${OBJTOP}/gnu/lib/libsupc++
 LIBASN1DIR=	${OBJTOP}/kerberos5/lib/libasn1
 LIBGSSAPI_KRB5DIR=	${OBJTOP}/kerberos5/lib/libgssapi_krb5
 LIBGSSAPI_NTLMDIR=	${OBJTOP}/kerberos5/lib/libgssapi_ntlm
 LIBGSSAPI_SPNEGODIR=	${OBJTOP}/kerberos5/lib/libgssapi_spnego
 LIBHDBDIR=	${OBJTOP}/kerberos5/lib/libhdb
 LIBHEIMBASEDIR=	${OBJTOP}/kerberos5/lib/libheimbase
 LIBHEIMIPCCDIR=	${OBJTOP}/kerberos5/lib/libheimipcc
 LIBHEIMIPCSDIR=	${OBJTOP}/kerberos5/lib/libheimipcs
 LIBHEIMNTLMDIR=	${OBJTOP}/kerberos5/lib/libheimntlm
 LIBHX509DIR=	${OBJTOP}/kerberos5/lib/libhx509
 LIBKADM5CLNTDIR=	${OBJTOP}/kerberos5/lib/libkadm5clnt
 LIBKADM5SRVDIR=	${OBJTOP}/kerberos5/lib/libkadm5srv
 LIBKAFS5DIR=	${OBJTOP}/kerberos5/lib/libkafs5
 LIBKDCDIR=	${OBJTOP}/kerberos5/lib/libkdc
 LIBKRB5DIR=	${OBJTOP}/kerberos5/lib/libkrb5
 LIBROKENDIR=	${OBJTOP}/kerberos5/lib/libroken
 LIBWINDDIR=	${OBJTOP}/kerberos5/lib/libwind
 LIBATF_CDIR=	${OBJTOP}/lib/atf/libatf-c
 LIBATF_CXXDIR=	${OBJTOP}/lib/atf/libatf-c++
 LIBALIASDIR=	${OBJTOP}/lib/libalias/libalias
 LIBBLACKLISTDIR=	${OBJTOP}/lib/libblacklist
 LIBBLOCKSRUNTIMEDIR=	${OBJTOP}/lib/libblocksruntime
 LIBBSNMPDIR=	${OBJTOP}/lib/libbsnmp/libbsnmp
 LIBCASPERDIR=	${OBJTOP}/lib/libcasper/libcasper
 LIBCAP_DNSDIR=	${OBJTOP}/lib/libcasper/services/cap_dns
 LIBCAP_GRPDIR=	${OBJTOP}/lib/libcasper/services/cap_grp
 LIBCAP_PWDDIR=	${OBJTOP}/lib/libcasper/services/cap_pwd
 LIBCAP_RANDOMDIR=	${OBJTOP}/lib/libcasper/services/cap_random
 LIBCAP_SYSCTLDIR=	${OBJTOP}/lib/libcasper/services/cap_sysctl
 LIBCAP_SYSLOGDIR=	${OBJTOP}/lib/libcasper/services/cap_syslog
 LIBBSDXMLDIR=	${OBJTOP}/lib/libexpat
 LIBKVMDIR=	${OBJTOP}/lib/libkvm
 LIBPTHREADDIR=	${OBJTOP}/lib/libthr
 LIBMDIR=	${OBJTOP}/lib/msun
 LIBFORMDIR=	${OBJTOP}/lib/ncurses/form
 LIBFORMLIBWDIR=	${OBJTOP}/lib/ncurses/formw
 LIBMENUDIR=	${OBJTOP}/lib/ncurses/menu
 LIBMENULIBWDIR=	${OBJTOP}/lib/ncurses/menuw
 LIBNCURSESDIR=	${OBJTOP}/lib/ncurses/ncurses
 LIBNCURSESWDIR=	${OBJTOP}/lib/ncurses/ncursesw
 LIBPANELDIR=	${OBJTOP}/lib/ncurses/panel
 LIBPANELWDIR=	${OBJTOP}/lib/ncurses/panelw
 LIBCRYPTODIR=	${OBJTOP}/secure/lib/libcrypto
 LIBSSHDIR=	${OBJTOP}/secure/lib/libssh
 LIBSSLDIR=	${OBJTOP}/secure/lib/libssl
 LIBTEKENDIR=	${OBJTOP}/sys/teken/libteken
 LIBEGACYDIR=	${OBJTOP}/tools/build
 LIBLNDIR=	${OBJTOP}/usr.bin/lex/lib
 
 LIBTERMCAPDIR=	${LIBNCURSESDIR}
 LIBTERMCAPWDIR=	${LIBNCURSESWDIR}
 
 # Default other library directories to lib/libNAME.
 .for lib in ${_LIBRARIES}
 LIB${lib:tu}DIR?=	${OBJTOP}/lib/lib${lib}
 .endfor
 
 # Validate that listed LIBADD are valid.
 .for _l in ${LIBADD}
 .if empty(_LIBRARIES:M${_l})
 _BADLIBADD+= ${_l}
 .endif
 .endfor
 .if !empty(_BADLIBADD)
 .error ${.CURDIR}: Invalid LIBADD used which may need to be added to ${_this:T}: ${_BADLIBADD}
 .endif
 
 # Sanity check that libraries are defined here properly when building them.
 .if defined(LIB) && ${_LIBRARIES:M${LIB}} != ""
 .if !empty(LIBADD) && \
     (!defined(_DP_${LIB}) || ${LIBADD:O:u} != ${_DP_${LIB}:O:u})
 .error ${.CURDIR}: Missing or incorrect _DP_${LIB} entry in ${_this:T}.  Should match LIBADD for ${LIB} ('${LIBADD}' vs '${_DP_${LIB}}')
 .endif
 # Note that OBJTOP is not yet defined here but for the purpose of the check
 # it is fine as it resolves to the SRC directory.
 .if !defined(LIB${LIB:tu}DIR) || !exists(${SRCTOP}/${LIB${LIB:tu}DIR:S,^${OBJTOP}/,,})
 .error ${.CURDIR}: Missing or incorrect value for LIB${LIB:tu}DIR in ${_this:T}: ${LIB${LIB:tu}DIR:S,^${OBJTOP}/,,}
 .endif
 .if ${_INTERNALLIBS:M${LIB}} != "" && !defined(LIB${LIB:tu})
 .error ${.CURDIR}: Missing value for LIB${LIB:tu} in ${_this:T}.  Likely should be: LIB${LIB:tu}?= $${LIB${LIB:tu}DIR}/lib${LIB}.a
 .endif
 .endif
 
 .endif	# !target(__<src.libnames.mk>__)
Index: projects/clang800-import/sys/arm64/rockchip/clk/rk_clk_composite.c
===================================================================
--- projects/clang800-import/sys/arm64/rockchip/clk/rk_clk_composite.c	(revision 344548)
+++ projects/clang800-import/sys/arm64/rockchip/clk/rk_clk_composite.c	(revision 344549)
@@ -1,286 +1,287 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2018 Emmanuel Vadot <manu@freebsd.org>
  * 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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
  *
  * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 
 #include <dev/extres/clk/clk.h>
 
 #include <arm64/rockchip/clk/rk_clk_composite.h>
 
 #include "clkdev_if.h"
 
 struct rk_clk_composite_sc {
 	uint32_t	muxdiv_offset;
 	uint32_t	mux_shift;
 	uint32_t	mux_width;
 	uint32_t	mux_mask;
 
 	uint32_t	div_shift;
 	uint32_t	div_width;
 	uint32_t	div_mask;
 
 	uint32_t	gate_offset;
 	uint32_t	gate_shift;
 
 	uint32_t	flags;
 };
 
 #define	WRITE4(_clk, off, val)						\
 	CLKDEV_WRITE_4(clknode_get_device(_clk), off, val)
 #define	READ4(_clk, off, val)						\
 	CLKDEV_READ_4(clknode_get_device(_clk), off, val)
 #define	DEVICE_LOCK(_clk)							\
 	CLKDEV_DEVICE_LOCK(clknode_get_device(_clk))
 #define	DEVICE_UNLOCK(_clk)						\
 	CLKDEV_DEVICE_UNLOCK(clknode_get_device(_clk))
 
 #define	RK_COMPOSITE_WRITE_MASK	0xFFFF0000
 
 static int
 rk_clk_composite_init(struct clknode *clk, device_t dev)
 {
 	struct rk_clk_composite_sc *sc;
 	uint32_t val, idx;
 
 	sc = clknode_get_softc(clk);
 
 	idx = 0;
 	if ((sc->flags & RK_CLK_COMPOSITE_HAVE_MUX) != 0) {
 		DEVICE_LOCK(clk);
 		READ4(clk, sc->muxdiv_offset, &val);
 		DEVICE_UNLOCK(clk);
 
 		idx = (val & sc->mux_mask) >> sc->mux_shift;
 	}
 
 	clknode_init_parent_idx(clk, idx);
 
 	return (0);
 }
 
 static int
 rk_clk_composite_set_gate(struct clknode *clk, bool enable)
 {
 	struct rk_clk_composite_sc *sc;
 	uint32_t val;
 
 	sc = clknode_get_softc(clk);
 
 	if ((sc->flags & RK_CLK_COMPOSITE_HAVE_GATE) == 0)
 		return (0);
 
 	DEVICE_LOCK(clk);
 	READ4(clk, sc->gate_offset, &val);
 	if (enable)
 		val &= ~(1 << sc->gate_shift);
 	else
 		val |= 1 << sc->gate_shift;
 	WRITE4(clk, sc->gate_offset, val | RK_CLK_COMPOSITE_MASK);
 	DEVICE_UNLOCK(clk);
 
 	return (0);
 }
 
 static int
 rk_clk_composite_set_mux(struct clknode *clk, int index)
 {
 	struct rk_clk_composite_sc *sc;
 	uint32_t val;
 
 	sc = clknode_get_softc(clk);
 
 	if ((sc->flags & RK_CLK_COMPOSITE_HAVE_MUX) == 0)
 		return (0);
 
 	DEVICE_LOCK(clk);
 	READ4(clk, sc->muxdiv_offset, &val);
 	val &= ~sc->mux_mask;
 	val |= index << sc->mux_shift;
-	WRITE4(clk, sc->muxdiv_offset, val);
+	WRITE4(clk, sc->muxdiv_offset, val | RK_CLK_COMPOSITE_MASK);
 	DEVICE_UNLOCK(clk);
 
 	return (0);
 }
 
 static int
 rk_clk_composite_recalc(struct clknode *clk, uint64_t *freq)
 {
 	struct rk_clk_composite_sc *sc;
 	uint32_t reg, div;
 
 	sc = clknode_get_softc(clk);
 
 	DEVICE_LOCK(clk);
 
 	READ4(clk, sc->muxdiv_offset, &reg);
 
 	DEVICE_UNLOCK(clk);
 
 	div = ((reg & sc->div_mask) >> sc->div_shift) + 1;
 
 	*freq = *freq / div;
 
 	return (0);
 }
 
 static uint32_t
 rk_clk_composite_find_best(struct rk_clk_composite_sc *sc, uint64_t fparent,
     uint64_t freq)
 {
 	uint64_t best, cur;
 	uint32_t best_div, div;
 
 	for (best = 0, best_div = 0, div = 0;
 	     div <= ((sc->div_mask >> sc->div_shift) + 1); div++) {
 		cur = fparent / div;
 		if ((freq - cur) < (freq - best)) {
 			best = cur;
 			best_div = div;
 			break;
 		}
 	}
 
 	return (best_div);
 }
 
 static int
 rk_clk_composite_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout,
     int flags, int *stop)
 {
 	struct rk_clk_composite_sc *sc;
 	struct clknode *p_clk;
 	const char **p_names;
 	uint64_t best, cur;
 	uint32_t div, best_div, val;
 	int p_idx, best_parent;
 
 	sc = clknode_get_softc(clk);
 
 	p_names = clknode_get_parent_names(clk);
 	for (best_div = 0, best = 0, p_idx = 0;
 	     p_idx != clknode_get_parents_num(clk); p_idx++) {
 		p_clk = clknode_find_by_name(p_names[p_idx]);
 		clknode_get_freq(p_clk, &fparent);
 		div = rk_clk_composite_find_best(sc, fparent, *fout);
 		cur = fparent / div;
 		if ((*fout - cur) < (*fout - best)) {
 			best = cur;
 			best_div = div;
 			best_parent = p_idx;
 		}
 	}
 
 	if (best_div == 0)
 		return (0);
 
 	if ((best < *fout) &&
 	  ((flags & CLK_SET_ROUND_DOWN) == 0)) {
 		*stop = 1;
 		return (ERANGE);
 	}
 	if ((best > *fout) &&
 	  ((flags & CLK_SET_ROUND_UP) == 0)) {
 		*stop = 1;
 		return (ERANGE);
 	}
 
 	if ((flags & CLK_SET_DRYRUN) != 0) {
 		*fout = best;
 		*stop = 1;
 		return (0);
 	}
 
+	p_idx = clknode_get_parent_idx(clk);
 	if (p_idx != best_parent)
 		clknode_set_parent_by_idx(clk, best_parent);
 
 	DEVICE_LOCK(clk);
 	READ4(clk, sc->muxdiv_offset, &val);
 	val &= ~sc->div_mask;
 	val |= (best_div - 1) << sc->div_shift;
 	WRITE4(clk, sc->muxdiv_offset, val | RK_CLK_COMPOSITE_MASK);
 	DEVICE_UNLOCK(clk);
 
 	*fout = best;
 	*stop = 1;
 
 	return (0);
 }
 
 static clknode_method_t rk_clk_composite_clknode_methods[] = {
 	/* Device interface */
 	CLKNODEMETHOD(clknode_init,		rk_clk_composite_init),
 	CLKNODEMETHOD(clknode_set_gate,		rk_clk_composite_set_gate),
 	CLKNODEMETHOD(clknode_set_mux,		rk_clk_composite_set_mux),
 	CLKNODEMETHOD(clknode_recalc_freq,	rk_clk_composite_recalc),
 	CLKNODEMETHOD(clknode_set_freq,		rk_clk_composite_set_freq),
 	CLKNODEMETHOD_END
 };
 
 DEFINE_CLASS_1(rk_clk_composite_clknode, rk_clk_composite_clknode_class,
     rk_clk_composite_clknode_methods, sizeof(struct rk_clk_composite_sc),
     clknode_class);
 
 int
 rk_clk_composite_register(struct clkdom *clkdom, struct rk_clk_composite_def *clkdef)
 {
 	struct clknode *clk;
 	struct rk_clk_composite_sc *sc;
 
 	clk = clknode_create(clkdom, &rk_clk_composite_clknode_class,
 	    &clkdef->clkdef);
 	if (clk == NULL)
 		return (1);
 
 	sc = clknode_get_softc(clk);
 
 	sc->muxdiv_offset = clkdef->muxdiv_offset;
 
 	sc->mux_shift = clkdef->mux_shift;
 	sc->mux_width = clkdef->mux_width;
 	sc->mux_mask = ((1 << clkdef->mux_width) - 1) << sc->mux_shift;
 
 	sc->div_shift = clkdef->div_shift;
 	sc->div_width = clkdef->div_width;
 	sc->div_mask = ((1 << clkdef->div_width) - 1) << sc->div_shift;
 
 	sc->gate_offset = clkdef->gate_offset;
 	sc->gate_shift = clkdef->gate_shift;
 
 	sc->flags = clkdef->flags;
 
 	clknode_register(clkdom, clk);
 
 	return (0);
 }
Index: projects/clang800-import/sys/dev/cxgbe/common/t4_hw.c
===================================================================
--- projects/clang800-import/sys/dev/cxgbe/common/t4_hw.c	(revision 344548)
+++ projects/clang800-import/sys/dev/cxgbe/common/t4_hw.c	(revision 344549)
@@ -1,10727 +1,10727 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2012, 2016 Chelsio Communications, Inc.
  * 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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 
 #include <sys/param.h>
 #include <sys/eventhandler.h>
 
 #include "common.h"
 #include "t4_regs.h"
 #include "t4_regs_values.h"
 #include "firmware/t4fw_interface.h"
 
 #undef msleep
 #define msleep(x) do { \
 	if (cold) \
 		DELAY((x) * 1000); \
 	else \
 		pause("t4hw", (x) * hz / 1000); \
 } while (0)
 
 /**
  *	t4_wait_op_done_val - wait until an operation is completed
  *	@adapter: the adapter performing the operation
  *	@reg: the register to check for completion
  *	@mask: a single-bit field within @reg that indicates completion
  *	@polarity: the value of the field when the operation is completed
  *	@attempts: number of check iterations
  *	@delay: delay in usecs between iterations
  *	@valp: where to store the value of the register at completion time
  *
  *	Wait until an operation is completed by checking a bit in a register
  *	up to @attempts times.  If @valp is not NULL the value of the register
  *	at the time it indicated completion is stored there.  Returns 0 if the
  *	operation completes and	-EAGAIN	otherwise.
  */
 static int t4_wait_op_done_val(struct adapter *adapter, int reg, u32 mask,
 			       int polarity, int attempts, int delay, u32 *valp)
 {
 	while (1) {
 		u32 val = t4_read_reg(adapter, reg);
 
 		if (!!(val & mask) == polarity) {
 			if (valp)
 				*valp = val;
 			return 0;
 		}
 		if (--attempts == 0)
 			return -EAGAIN;
 		if (delay)
 			udelay(delay);
 	}
 }
 
 static inline int t4_wait_op_done(struct adapter *adapter, int reg, u32 mask,
 				  int polarity, int attempts, int delay)
 {
 	return t4_wait_op_done_val(adapter, reg, mask, polarity, attempts,
 				   delay, NULL);
 }
 
 /**
  *	t4_set_reg_field - set a register field to a value
  *	@adapter: the adapter to program
  *	@addr: the register address
  *	@mask: specifies the portion of the register to modify
  *	@val: the new value for the register field
  *
  *	Sets a register field specified by the supplied mask to the
  *	given value.
  */
 void t4_set_reg_field(struct adapter *adapter, unsigned int addr, u32 mask,
 		      u32 val)
 {
 	u32 v = t4_read_reg(adapter, addr) & ~mask;
 
 	t4_write_reg(adapter, addr, v | val);
 	(void) t4_read_reg(adapter, addr);      /* flush */
 }
 
 /**
  *	t4_read_indirect - read indirectly addressed registers
  *	@adap: the adapter
  *	@addr_reg: register holding the indirect address
  *	@data_reg: register holding the value of the indirect register
  *	@vals: where the read register values are stored
  *	@nregs: how many indirect registers to read
  *	@start_idx: index of first indirect register to read
  *
  *	Reads registers that are accessed indirectly through an address/data
  *	register pair.
  */
 void t4_read_indirect(struct adapter *adap, unsigned int addr_reg,
 			     unsigned int data_reg, u32 *vals,
 			     unsigned int nregs, unsigned int start_idx)
 {
 	while (nregs--) {
 		t4_write_reg(adap, addr_reg, start_idx);
 		*vals++ = t4_read_reg(adap, data_reg);
 		start_idx++;
 	}
 }
 
 /**
  *	t4_write_indirect - write indirectly addressed registers
  *	@adap: the adapter
  *	@addr_reg: register holding the indirect addresses
  *	@data_reg: register holding the value for the indirect registers
  *	@vals: values to write
  *	@nregs: how many indirect registers to write
  *	@start_idx: address of first indirect register to write
  *
  *	Writes a sequential block of registers that are accessed indirectly
  *	through an address/data register pair.
  */
 void t4_write_indirect(struct adapter *adap, unsigned int addr_reg,
 		       unsigned int data_reg, const u32 *vals,
 		       unsigned int nregs, unsigned int start_idx)
 {
 	while (nregs--) {
 		t4_write_reg(adap, addr_reg, start_idx++);
 		t4_write_reg(adap, data_reg, *vals++);
 	}
 }
 
 /*
  * Read a 32-bit PCI Configuration Space register via the PCI-E backdoor
  * mechanism.  This guarantees that we get the real value even if we're
  * operating within a Virtual Machine and the Hypervisor is trapping our
  * Configuration Space accesses.
  *
  * N.B. This routine should only be used as a last resort: the firmware uses
  *      the backdoor registers on a regular basis and we can end up
  *      conflicting with it's uses!
  */
 u32 t4_hw_pci_read_cfg4(adapter_t *adap, int reg)
 {
 	u32 req = V_FUNCTION(adap->pf) | V_REGISTER(reg);
 	u32 val;
 
 	if (chip_id(adap) <= CHELSIO_T5)
 		req |= F_ENABLE;
 	else
 		req |= F_T6_ENABLE;
 
 	if (is_t4(adap))
 		req |= F_LOCALCFG;
 
 	t4_write_reg(adap, A_PCIE_CFG_SPACE_REQ, req);
 	val = t4_read_reg(adap, A_PCIE_CFG_SPACE_DATA);
 
 	/*
 	 * Reset F_ENABLE to 0 so reads of PCIE_CFG_SPACE_DATA won't cause a
 	 * Configuration Space read.  (None of the other fields matter when
 	 * F_ENABLE is 0 so a simple register write is easier than a
 	 * read-modify-write via t4_set_reg_field().)
 	 */
 	t4_write_reg(adap, A_PCIE_CFG_SPACE_REQ, 0);
 
 	return val;
 }
 
 /*
  * t4_report_fw_error - report firmware error
  * @adap: the adapter
  *
  * The adapter firmware can indicate error conditions to the host.
  * If the firmware has indicated an error, print out the reason for
  * the firmware error.
  */
 static void t4_report_fw_error(struct adapter *adap)
 {
 	static const char *const reason[] = {
 		"Crash",			/* PCIE_FW_EVAL_CRASH */
 		"During Device Preparation",	/* PCIE_FW_EVAL_PREP */
 		"During Device Configuration",	/* PCIE_FW_EVAL_CONF */
 		"During Device Initialization",	/* PCIE_FW_EVAL_INIT */
 		"Unexpected Event",		/* PCIE_FW_EVAL_UNEXPECTEDEVENT */
 		"Insufficient Airflow",		/* PCIE_FW_EVAL_OVERHEAT */
 		"Device Shutdown",		/* PCIE_FW_EVAL_DEVICESHUTDOWN */
 		"Reserved",			/* reserved */
 	};
 	u32 pcie_fw;
 
 	pcie_fw = t4_read_reg(adap, A_PCIE_FW);
 	if (pcie_fw & F_PCIE_FW_ERR) {
 		adap->flags &= ~FW_OK;
 		CH_ERR(adap, "firmware reports adapter error: %s (0x%08x)\n",
 		    reason[G_PCIE_FW_EVAL(pcie_fw)], pcie_fw);
 		if (pcie_fw != 0xffffffff)
 			t4_os_dump_devlog(adap);
 	}
 }
 
 /*
  * Get the reply to a mailbox command and store it in @rpl in big-endian order.
  */
 static void get_mbox_rpl(struct adapter *adap, __be64 *rpl, int nflit,
 			 u32 mbox_addr)
 {
 	for ( ; nflit; nflit--, mbox_addr += 8)
 		*rpl++ = cpu_to_be64(t4_read_reg64(adap, mbox_addr));
 }
 
 /*
  * Handle a FW assertion reported in a mailbox.
  */
 static void fw_asrt(struct adapter *adap, struct fw_debug_cmd *asrt)
 {
 	CH_ALERT(adap,
 		  "FW assertion at %.16s:%u, val0 %#x, val1 %#x\n",
 		  asrt->u.assert.filename_0_7,
 		  be32_to_cpu(asrt->u.assert.line),
 		  be32_to_cpu(asrt->u.assert.x),
 		  be32_to_cpu(asrt->u.assert.y));
 }
 
 struct port_tx_state {
 	uint64_t rx_pause;
 	uint64_t tx_frames;
 };
 
 static void
 read_tx_state_one(struct adapter *sc, int i, struct port_tx_state *tx_state)
 {
 	uint32_t rx_pause_reg, tx_frames_reg;
 
 	if (is_t4(sc)) {
 		tx_frames_reg = PORT_REG(i, A_MPS_PORT_STAT_TX_PORT_FRAMES_L);
 		rx_pause_reg = PORT_REG(i, A_MPS_PORT_STAT_RX_PORT_PAUSE_L);
 	} else {
 		tx_frames_reg = T5_PORT_REG(i, A_MPS_PORT_STAT_TX_PORT_FRAMES_L);
 		rx_pause_reg = T5_PORT_REG(i, A_MPS_PORT_STAT_RX_PORT_PAUSE_L);
 	}
 
 	tx_state->rx_pause = t4_read_reg64(sc, rx_pause_reg);
 	tx_state->tx_frames = t4_read_reg64(sc, tx_frames_reg);
 }
 
 static void
 read_tx_state(struct adapter *sc, struct port_tx_state *tx_state)
 {
 	int i;
 
 	for_each_port(sc, i)
 		read_tx_state_one(sc, i, &tx_state[i]);
 }
 
 static void
 check_tx_state(struct adapter *sc, struct port_tx_state *tx_state)
 {
 	uint32_t port_ctl_reg;
 	uint64_t tx_frames, rx_pause;
 	int i;
 
 	for_each_port(sc, i) {
 		rx_pause = tx_state[i].rx_pause;
 		tx_frames = tx_state[i].tx_frames;
 		read_tx_state_one(sc, i, &tx_state[i]);	/* update */
 
 		if (is_t4(sc))
 			port_ctl_reg = PORT_REG(i, A_MPS_PORT_CTL);
 		else
 			port_ctl_reg = T5_PORT_REG(i, A_MPS_PORT_CTL);
 		if (t4_read_reg(sc, port_ctl_reg) & F_PORTTXEN &&
 		    rx_pause != tx_state[i].rx_pause &&
 		    tx_frames == tx_state[i].tx_frames) {
 			t4_set_reg_field(sc, port_ctl_reg, F_PORTTXEN, 0);
 			mdelay(1);
 			t4_set_reg_field(sc, port_ctl_reg, F_PORTTXEN, F_PORTTXEN);
 		}
 	}
 }
 
 #define X_CIM_PF_NOACCESS 0xeeeeeeee
 /**
  *	t4_wr_mbox_meat_timeout - send a command to FW through the given mailbox
  *	@adap: the adapter
  *	@mbox: index of the mailbox to use
  *	@cmd: the command to write
  *	@size: command length in bytes
  *	@rpl: where to optionally store the reply
  *	@sleep_ok: if true we may sleep while awaiting command completion
  *	@timeout: time to wait for command to finish before timing out
  *		(negative implies @sleep_ok=false)
  *
  *	Sends the given command to FW through the selected mailbox and waits
  *	for the FW to execute the command.  If @rpl is not %NULL it is used to
  *	store the FW's reply to the command.  The command and its optional
  *	reply are of the same length.  Some FW commands like RESET and
  *	INITIALIZE can take a considerable amount of time to execute.
  *	@sleep_ok determines whether we may sleep while awaiting the response.
  *	If sleeping is allowed we use progressive backoff otherwise we spin.
  *	Note that passing in a negative @timeout is an alternate mechanism
  *	for specifying @sleep_ok=false.  This is useful when a higher level
  *	interface allows for specification of @timeout but not @sleep_ok ...
  *
  *	The return value is 0 on success or a negative errno on failure.  A
  *	failure can happen either because we are not able to execute the
  *	command or FW executes it but signals an error.  In the latter case
  *	the return value is the error code indicated by FW (negated).
  */
 int t4_wr_mbox_meat_timeout(struct adapter *adap, int mbox, const void *cmd,
 			    int size, void *rpl, bool sleep_ok, int timeout)
 {
 	/*
 	 * We delay in small increments at first in an effort to maintain
 	 * responsiveness for simple, fast executing commands but then back
 	 * off to larger delays to a maximum retry delay.
 	 */
 	static const int delay[] = {
 		1, 1, 3, 5, 10, 10, 20, 50, 100
 	};
 	u32 v;
 	u64 res;
 	int i, ms, delay_idx, ret, next_tx_check;
 	u32 data_reg = PF_REG(mbox, A_CIM_PF_MAILBOX_DATA);
 	u32 ctl_reg = PF_REG(mbox, A_CIM_PF_MAILBOX_CTRL);
 	u32 ctl;
 	__be64 cmd_rpl[MBOX_LEN/8];
 	u32 pcie_fw;
 	struct port_tx_state tx_state[MAX_NPORTS];
 
 	if (adap->flags & CHK_MBOX_ACCESS)
 		ASSERT_SYNCHRONIZED_OP(adap);
 
 	if (size <= 0 || (size & 15) || size > MBOX_LEN)
 		return -EINVAL;
 
 	if (adap->flags & IS_VF) {
 		if (is_t6(adap))
 			data_reg = FW_T6VF_MBDATA_BASE_ADDR;
 		else
 			data_reg = FW_T4VF_MBDATA_BASE_ADDR;
 		ctl_reg = VF_CIM_REG(A_CIM_VF_EXT_MAILBOX_CTRL);
 	}
 
 	/*
 	 * If we have a negative timeout, that implies that we can't sleep.
 	 */
 	if (timeout < 0) {
 		sleep_ok = false;
 		timeout = -timeout;
 	}
 
 	/*
 	 * Attempt to gain access to the mailbox.
 	 */
 	for (i = 0; i < 4; i++) {
 		ctl = t4_read_reg(adap, ctl_reg);
 		v = G_MBOWNER(ctl);
 		if (v != X_MBOWNER_NONE)
 			break;
 	}
 
 	/*
 	 * If we were unable to gain access, report the error to our caller.
 	 */
 	if (v != X_MBOWNER_PL) {
 		t4_report_fw_error(adap);
 		ret = (v == X_MBOWNER_FW) ? -EBUSY : -ETIMEDOUT;
 		return ret;
 	}
 
 	/*
 	 * If we gain ownership of the mailbox and there's a "valid" message
 	 * in it, this is likely an asynchronous error message from the
 	 * firmware.  So we'll report that and then proceed on with attempting
 	 * to issue our own command ... which may well fail if the error
 	 * presaged the firmware crashing ...
 	 */
 	if (ctl & F_MBMSGVALID) {
 		CH_DUMP_MBOX(adap, mbox, data_reg, "VLD", NULL, true);
 	}
 
 	/*
 	 * Copy in the new mailbox command and send it on its way ...
 	 */
 	memset(cmd_rpl, 0, sizeof(cmd_rpl));
 	memcpy(cmd_rpl, cmd, size);
 	CH_DUMP_MBOX(adap, mbox, 0, "cmd", cmd_rpl, false);
 	for (i = 0; i < ARRAY_SIZE(cmd_rpl); i++)
 		t4_write_reg64(adap, data_reg + i * 8, be64_to_cpu(cmd_rpl[i]));
 
 	if (adap->flags & IS_VF) {
 		/*
 		 * For the VFs, the Mailbox Data "registers" are
 		 * actually backed by T4's "MA" interface rather than
 		 * PL Registers (as is the case for the PFs).  Because
 		 * these are in different coherency domains, the write
 		 * to the VF's PL-register-backed Mailbox Control can
 		 * race in front of the writes to the MA-backed VF
 		 * Mailbox Data "registers".  So we need to do a
 		 * read-back on at least one byte of the VF Mailbox
 		 * Data registers before doing the write to the VF
 		 * Mailbox Control register.
 		 */
 		t4_read_reg(adap, data_reg);
 	}
 
 	t4_write_reg(adap, ctl_reg, F_MBMSGVALID | V_MBOWNER(X_MBOWNER_FW));
 	read_tx_state(adap, &tx_state[0]);	/* also flushes the write_reg */
 	next_tx_check = 1000;
 	delay_idx = 0;
 	ms = delay[0];
 
 	/*
 	 * Loop waiting for the reply; bail out if we time out or the firmware
 	 * reports an error.
 	 */
 	pcie_fw = 0;
 	for (i = 0; i < timeout; i += ms) {
 		if (!(adap->flags & IS_VF)) {
 			pcie_fw = t4_read_reg(adap, A_PCIE_FW);
 			if (pcie_fw & F_PCIE_FW_ERR)
 				break;
 		}
 
 		if (i >= next_tx_check) {
 			check_tx_state(adap, &tx_state[0]);
 			next_tx_check = i + 1000;
 		}
 
 		if (sleep_ok) {
 			ms = delay[delay_idx];  /* last element may repeat */
 			if (delay_idx < ARRAY_SIZE(delay) - 1)
 				delay_idx++;
 			msleep(ms);
 		} else {
 			mdelay(ms);
 		}
 
 		v = t4_read_reg(adap, ctl_reg);
 		if (v == X_CIM_PF_NOACCESS)
 			continue;
 		if (G_MBOWNER(v) == X_MBOWNER_PL) {
 			if (!(v & F_MBMSGVALID)) {
 				t4_write_reg(adap, ctl_reg,
 					     V_MBOWNER(X_MBOWNER_NONE));
 				continue;
 			}
 
 			/*
 			 * Retrieve the command reply and release the mailbox.
 			 */
 			get_mbox_rpl(adap, cmd_rpl, MBOX_LEN/8, data_reg);
 			CH_DUMP_MBOX(adap, mbox, 0, "rpl", cmd_rpl, false);
 			t4_write_reg(adap, ctl_reg, V_MBOWNER(X_MBOWNER_NONE));
 
 			res = be64_to_cpu(cmd_rpl[0]);
 			if (G_FW_CMD_OP(res >> 32) == FW_DEBUG_CMD) {
 				fw_asrt(adap, (struct fw_debug_cmd *)cmd_rpl);
 				res = V_FW_CMD_RETVAL(EIO);
 			} else if (rpl)
 				memcpy(rpl, cmd_rpl, size);
 			return -G_FW_CMD_RETVAL((int)res);
 		}
 	}
 
 	/*
 	 * We timed out waiting for a reply to our mailbox command.  Report
 	 * the error and also check to see if the firmware reported any
 	 * errors ...
 	 */
 	CH_ERR(adap, "command %#x in mbox %d timed out (0x%08x).\n",
 	    *(const u8 *)cmd, mbox, pcie_fw);
 	CH_DUMP_MBOX(adap, mbox, 0, "cmdsent", cmd_rpl, true);
 	CH_DUMP_MBOX(adap, mbox, data_reg, "current", NULL, true);
 
 	if (pcie_fw & F_PCIE_FW_ERR) {
 		ret = -ENXIO;
 		t4_report_fw_error(adap);
 	} else {
 		ret = -ETIMEDOUT;
 		t4_os_dump_devlog(adap);
 	}
 
 	t4_fatal_err(adap, true);
 	return ret;
 }
 
 int t4_wr_mbox_meat(struct adapter *adap, int mbox, const void *cmd, int size,
 		    void *rpl, bool sleep_ok)
 {
 		return t4_wr_mbox_meat_timeout(adap, mbox, cmd, size, rpl,
 					       sleep_ok, FW_CMD_MAX_TIMEOUT);
 
 }
 
 static int t4_edc_err_read(struct adapter *adap, int idx)
 {
 	u32 edc_ecc_err_addr_reg;
 	u32 edc_bist_status_rdata_reg;
 
 	if (is_t4(adap)) {
 		CH_WARN(adap, "%s: T4 NOT supported.\n", __func__);
 		return 0;
 	}
 	if (idx != MEM_EDC0 && idx != MEM_EDC1) {
 		CH_WARN(adap, "%s: idx %d NOT supported.\n", __func__, idx);
 		return 0;
 	}
 
 	edc_ecc_err_addr_reg = EDC_T5_REG(A_EDC_H_ECC_ERR_ADDR, idx);
 	edc_bist_status_rdata_reg = EDC_T5_REG(A_EDC_H_BIST_STATUS_RDATA, idx);
 
 	CH_WARN(adap,
 		"edc%d err addr 0x%x: 0x%x.\n",
 		idx, edc_ecc_err_addr_reg,
 		t4_read_reg(adap, edc_ecc_err_addr_reg));
 	CH_WARN(adap,
 	 	"bist: 0x%x, status %llx %llx %llx %llx %llx %llx %llx %llx %llx.\n",
 		edc_bist_status_rdata_reg,
 		(unsigned long long)t4_read_reg64(adap, edc_bist_status_rdata_reg),
 		(unsigned long long)t4_read_reg64(adap, edc_bist_status_rdata_reg + 8),
 		(unsigned long long)t4_read_reg64(adap, edc_bist_status_rdata_reg + 16),
 		(unsigned long long)t4_read_reg64(adap, edc_bist_status_rdata_reg + 24),
 		(unsigned long long)t4_read_reg64(adap, edc_bist_status_rdata_reg + 32),
 		(unsigned long long)t4_read_reg64(adap, edc_bist_status_rdata_reg + 40),
 		(unsigned long long)t4_read_reg64(adap, edc_bist_status_rdata_reg + 48),
 		(unsigned long long)t4_read_reg64(adap, edc_bist_status_rdata_reg + 56),
 		(unsigned long long)t4_read_reg64(adap, edc_bist_status_rdata_reg + 64));
 
 	return 0;
 }
 
 /**
  *	t4_mc_read - read from MC through backdoor accesses
  *	@adap: the adapter
  *	@idx: which MC to access
  *	@addr: address of first byte requested
  *	@data: 64 bytes of data containing the requested address
  *	@ecc: where to store the corresponding 64-bit ECC word
  *
  *	Read 64 bytes of data from MC starting at a 64-byte-aligned address
  *	that covers the requested address @addr.  If @parity is not %NULL it
  *	is assigned the 64-bit ECC word for the read data.
  */
 int t4_mc_read(struct adapter *adap, int idx, u32 addr, __be32 *data, u64 *ecc)
 {
 	int i;
 	u32 mc_bist_cmd_reg, mc_bist_cmd_addr_reg, mc_bist_cmd_len_reg;
 	u32 mc_bist_status_rdata_reg, mc_bist_data_pattern_reg;
 
 	if (is_t4(adap)) {
 		mc_bist_cmd_reg = A_MC_BIST_CMD;
 		mc_bist_cmd_addr_reg = A_MC_BIST_CMD_ADDR;
 		mc_bist_cmd_len_reg = A_MC_BIST_CMD_LEN;
 		mc_bist_status_rdata_reg = A_MC_BIST_STATUS_RDATA;
 		mc_bist_data_pattern_reg = A_MC_BIST_DATA_PATTERN;
 	} else {
 		mc_bist_cmd_reg = MC_REG(A_MC_P_BIST_CMD, idx);
 		mc_bist_cmd_addr_reg = MC_REG(A_MC_P_BIST_CMD_ADDR, idx);
 		mc_bist_cmd_len_reg = MC_REG(A_MC_P_BIST_CMD_LEN, idx);
 		mc_bist_status_rdata_reg = MC_REG(A_MC_P_BIST_STATUS_RDATA,
 						  idx);
 		mc_bist_data_pattern_reg = MC_REG(A_MC_P_BIST_DATA_PATTERN,
 						  idx);
 	}
 
 	if (t4_read_reg(adap, mc_bist_cmd_reg) & F_START_BIST)
 		return -EBUSY;
 	t4_write_reg(adap, mc_bist_cmd_addr_reg, addr & ~0x3fU);
 	t4_write_reg(adap, mc_bist_cmd_len_reg, 64);
 	t4_write_reg(adap, mc_bist_data_pattern_reg, 0xc);
 	t4_write_reg(adap, mc_bist_cmd_reg, V_BIST_OPCODE(1) |
 		     F_START_BIST | V_BIST_CMD_GAP(1));
 	i = t4_wait_op_done(adap, mc_bist_cmd_reg, F_START_BIST, 0, 10, 1);
 	if (i)
 		return i;
 
 #define MC_DATA(i) MC_BIST_STATUS_REG(mc_bist_status_rdata_reg, i)
 
 	for (i = 15; i >= 0; i--)
 		*data++ = ntohl(t4_read_reg(adap, MC_DATA(i)));
 	if (ecc)
 		*ecc = t4_read_reg64(adap, MC_DATA(16));
 #undef MC_DATA
 	return 0;
 }
 
 /**
  *	t4_edc_read - read from EDC through backdoor accesses
  *	@adap: the adapter
  *	@idx: which EDC to access
  *	@addr: address of first byte requested
  *	@data: 64 bytes of data containing the requested address
  *	@ecc: where to store the corresponding 64-bit ECC word
  *
  *	Read 64 bytes of data from EDC starting at a 64-byte-aligned address
  *	that covers the requested address @addr.  If @parity is not %NULL it
  *	is assigned the 64-bit ECC word for the read data.
  */
 int t4_edc_read(struct adapter *adap, int idx, u32 addr, __be32 *data, u64 *ecc)
 {
 	int i;
 	u32 edc_bist_cmd_reg, edc_bist_cmd_addr_reg, edc_bist_cmd_len_reg;
 	u32 edc_bist_cmd_data_pattern, edc_bist_status_rdata_reg;
 
 	if (is_t4(adap)) {
 		edc_bist_cmd_reg = EDC_REG(A_EDC_BIST_CMD, idx);
 		edc_bist_cmd_addr_reg = EDC_REG(A_EDC_BIST_CMD_ADDR, idx);
 		edc_bist_cmd_len_reg = EDC_REG(A_EDC_BIST_CMD_LEN, idx);
 		edc_bist_cmd_data_pattern = EDC_REG(A_EDC_BIST_DATA_PATTERN,
 						    idx);
 		edc_bist_status_rdata_reg = EDC_REG(A_EDC_BIST_STATUS_RDATA,
 						    idx);
 	} else {
 /*
  * These macro are missing in t4_regs.h file.
  * Added temporarily for testing.
  */
 #define EDC_STRIDE_T5 (EDC_T51_BASE_ADDR - EDC_T50_BASE_ADDR)
 #define EDC_REG_T5(reg, idx) (reg + EDC_STRIDE_T5 * idx)
 		edc_bist_cmd_reg = EDC_REG_T5(A_EDC_H_BIST_CMD, idx);
 		edc_bist_cmd_addr_reg = EDC_REG_T5(A_EDC_H_BIST_CMD_ADDR, idx);
 		edc_bist_cmd_len_reg = EDC_REG_T5(A_EDC_H_BIST_CMD_LEN, idx);
 		edc_bist_cmd_data_pattern = EDC_REG_T5(A_EDC_H_BIST_DATA_PATTERN,
 						    idx);
 		edc_bist_status_rdata_reg = EDC_REG_T5(A_EDC_H_BIST_STATUS_RDATA,
 						    idx);
 #undef EDC_REG_T5
 #undef EDC_STRIDE_T5
 	}
 
 	if (t4_read_reg(adap, edc_bist_cmd_reg) & F_START_BIST)
 		return -EBUSY;
 	t4_write_reg(adap, edc_bist_cmd_addr_reg, addr & ~0x3fU);
 	t4_write_reg(adap, edc_bist_cmd_len_reg, 64);
 	t4_write_reg(adap, edc_bist_cmd_data_pattern, 0xc);
 	t4_write_reg(adap, edc_bist_cmd_reg,
 		     V_BIST_OPCODE(1) | V_BIST_CMD_GAP(1) | F_START_BIST);
 	i = t4_wait_op_done(adap, edc_bist_cmd_reg, F_START_BIST, 0, 10, 1);
 	if (i)
 		return i;
 
 #define EDC_DATA(i) EDC_BIST_STATUS_REG(edc_bist_status_rdata_reg, i)
 
 	for (i = 15; i >= 0; i--)
 		*data++ = ntohl(t4_read_reg(adap, EDC_DATA(i)));
 	if (ecc)
 		*ecc = t4_read_reg64(adap, EDC_DATA(16));
 #undef EDC_DATA
 	return 0;
 }
 
 /**
  *	t4_mem_read - read EDC 0, EDC 1 or MC into buffer
  *	@adap: the adapter
  *	@mtype: memory type: MEM_EDC0, MEM_EDC1 or MEM_MC
  *	@addr: address within indicated memory type
  *	@len: amount of memory to read
  *	@buf: host memory buffer
  *
  *	Reads an [almost] arbitrary memory region in the firmware: the
  *	firmware memory address, length and host buffer must be aligned on
  *	32-bit boudaries.  The memory is returned as a raw byte sequence from
  *	the firmware's memory.  If this memory contains data structures which
  *	contain multi-byte integers, it's the callers responsibility to
  *	perform appropriate byte order conversions.
  */
 int t4_mem_read(struct adapter *adap, int mtype, u32 addr, u32 len,
 		__be32 *buf)
 {
 	u32 pos, start, end, offset;
 	int ret;
 
 	/*
 	 * Argument sanity checks ...
 	 */
 	if ((addr & 0x3) || (len & 0x3))
 		return -EINVAL;
 
 	/*
 	 * The underlaying EDC/MC read routines read 64 bytes at a time so we
 	 * need to round down the start and round up the end.  We'll start
 	 * copying out of the first line at (addr - start) a word at a time.
 	 */
 	start = rounddown2(addr, 64);
 	end = roundup2(addr + len, 64);
 	offset = (addr - start)/sizeof(__be32);
 
 	for (pos = start; pos < end; pos += 64, offset = 0) {
 		__be32 data[16];
 
 		/*
 		 * Read the chip's memory block and bail if there's an error.
 		 */
 		if ((mtype == MEM_MC) || (mtype == MEM_MC1))
 			ret = t4_mc_read(adap, mtype - MEM_MC, pos, data, NULL);
 		else
 			ret = t4_edc_read(adap, mtype, pos, data, NULL);
 		if (ret)
 			return ret;
 
 		/*
 		 * Copy the data into the caller's memory buffer.
 		 */
 		while (offset < 16 && len > 0) {
 			*buf++ = data[offset++];
 			len -= sizeof(__be32);
 		}
 	}
 
 	return 0;
 }
 
 /*
  * Return the specified PCI-E Configuration Space register from our Physical
  * Function.  We try first via a Firmware LDST Command (if fw_attach != 0)
  * since we prefer to let the firmware own all of these registers, but if that
  * fails we go for it directly ourselves.
  */
 u32 t4_read_pcie_cfg4(struct adapter *adap, int reg, int drv_fw_attach)
 {
 
 	/*
 	 * If fw_attach != 0, construct and send the Firmware LDST Command to
 	 * retrieve the specified PCI-E Configuration Space register.
 	 */
 	if (drv_fw_attach != 0) {
 		struct fw_ldst_cmd ldst_cmd;
 		int ret;
 
 		memset(&ldst_cmd, 0, sizeof(ldst_cmd));
 		ldst_cmd.op_to_addrspace =
 			cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
 				    F_FW_CMD_REQUEST |
 				    F_FW_CMD_READ |
 				    V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_FUNC_PCIE));
 		ldst_cmd.cycles_to_len16 = cpu_to_be32(FW_LEN16(ldst_cmd));
 		ldst_cmd.u.pcie.select_naccess = V_FW_LDST_CMD_NACCESS(1);
 		ldst_cmd.u.pcie.ctrl_to_fn =
 			(F_FW_LDST_CMD_LC | V_FW_LDST_CMD_FN(adap->pf));
 		ldst_cmd.u.pcie.r = reg;
 
 		/*
 		 * If the LDST Command succeeds, return the result, otherwise
 		 * fall through to reading it directly ourselves ...
 		 */
 		ret = t4_wr_mbox(adap, adap->mbox, &ldst_cmd, sizeof(ldst_cmd),
 				 &ldst_cmd);
 		if (ret == 0)
 			return be32_to_cpu(ldst_cmd.u.pcie.data[0]);
 
 		CH_WARN(adap, "Firmware failed to return "
 			"Configuration Space register %d, err = %d\n",
 			reg, -ret);
 	}
 
 	/*
 	 * Read the desired Configuration Space register via the PCI-E
 	 * Backdoor mechanism.
 	 */
 	return t4_hw_pci_read_cfg4(adap, reg);
 }
 
 /**
  *	t4_get_regs_len - return the size of the chips register set
  *	@adapter: the adapter
  *
  *	Returns the size of the chip's BAR0 register space.
  */
 unsigned int t4_get_regs_len(struct adapter *adapter)
 {
 	unsigned int chip_version = chip_id(adapter);
 
 	switch (chip_version) {
 	case CHELSIO_T4:
 		if (adapter->flags & IS_VF)
 			return FW_T4VF_REGMAP_SIZE;
 		return T4_REGMAP_SIZE;
 
 	case CHELSIO_T5:
 	case CHELSIO_T6:
 		if (adapter->flags & IS_VF)
 			return FW_T4VF_REGMAP_SIZE;
 		return T5_REGMAP_SIZE;
 	}
 
 	CH_ERR(adapter,
 		"Unsupported chip version %d\n", chip_version);
 	return 0;
 }
 
 /**
  *	t4_get_regs - read chip registers into provided buffer
  *	@adap: the adapter
  *	@buf: register buffer
  *	@buf_size: size (in bytes) of register buffer
  *
  *	If the provided register buffer isn't large enough for the chip's
  *	full register range, the register dump will be truncated to the
  *	register buffer's size.
  */
 void t4_get_regs(struct adapter *adap, u8 *buf, size_t buf_size)
 {
 	static const unsigned int t4_reg_ranges[] = {
 		0x1008, 0x1108,
 		0x1180, 0x1184,
 		0x1190, 0x1194,
 		0x11a0, 0x11a4,
 		0x11b0, 0x11b4,
 		0x11fc, 0x123c,
 		0x1300, 0x173c,
 		0x1800, 0x18fc,
 		0x3000, 0x30d8,
 		0x30e0, 0x30e4,
 		0x30ec, 0x5910,
 		0x5920, 0x5924,
 		0x5960, 0x5960,
 		0x5968, 0x5968,
 		0x5970, 0x5970,
 		0x5978, 0x5978,
 		0x5980, 0x5980,
 		0x5988, 0x5988,
 		0x5990, 0x5990,
 		0x5998, 0x5998,
 		0x59a0, 0x59d4,
 		0x5a00, 0x5ae0,
 		0x5ae8, 0x5ae8,
 		0x5af0, 0x5af0,
 		0x5af8, 0x5af8,
 		0x6000, 0x6098,
 		0x6100, 0x6150,
 		0x6200, 0x6208,
 		0x6240, 0x6248,
 		0x6280, 0x62b0,
 		0x62c0, 0x6338,
 		0x6370, 0x638c,
 		0x6400, 0x643c,
 		0x6500, 0x6524,
 		0x6a00, 0x6a04,
 		0x6a14, 0x6a38,
 		0x6a60, 0x6a70,
 		0x6a78, 0x6a78,
 		0x6b00, 0x6b0c,
 		0x6b1c, 0x6b84,
 		0x6bf0, 0x6bf8,
 		0x6c00, 0x6c0c,
 		0x6c1c, 0x6c84,
 		0x6cf0, 0x6cf8,
 		0x6d00, 0x6d0c,
 		0x6d1c, 0x6d84,
 		0x6df0, 0x6df8,
 		0x6e00, 0x6e0c,
 		0x6e1c, 0x6e84,
 		0x6ef0, 0x6ef8,
 		0x6f00, 0x6f0c,
 		0x6f1c, 0x6f84,
 		0x6ff0, 0x6ff8,
 		0x7000, 0x700c,
 		0x701c, 0x7084,
 		0x70f0, 0x70f8,
 		0x7100, 0x710c,
 		0x711c, 0x7184,
 		0x71f0, 0x71f8,
 		0x7200, 0x720c,
 		0x721c, 0x7284,
 		0x72f0, 0x72f8,
 		0x7300, 0x730c,
 		0x731c, 0x7384,
 		0x73f0, 0x73f8,
 		0x7400, 0x7450,
 		0x7500, 0x7530,
 		0x7600, 0x760c,
 		0x7614, 0x761c,
 		0x7680, 0x76cc,
 		0x7700, 0x7798,
 		0x77c0, 0x77fc,
 		0x7900, 0x79fc,
 		0x7b00, 0x7b58,
 		0x7b60, 0x7b84,
 		0x7b8c, 0x7c38,
 		0x7d00, 0x7d38,
 		0x7d40, 0x7d80,
 		0x7d8c, 0x7ddc,
 		0x7de4, 0x7e04,
 		0x7e10, 0x7e1c,
 		0x7e24, 0x7e38,
 		0x7e40, 0x7e44,
 		0x7e4c, 0x7e78,
 		0x7e80, 0x7ea4,
 		0x7eac, 0x7edc,
 		0x7ee8, 0x7efc,
 		0x8dc0, 0x8e04,
 		0x8e10, 0x8e1c,
 		0x8e30, 0x8e78,
 		0x8ea0, 0x8eb8,
 		0x8ec0, 0x8f6c,
 		0x8fc0, 0x9008,
 		0x9010, 0x9058,
 		0x9060, 0x9060,
 		0x9068, 0x9074,
 		0x90fc, 0x90fc,
 		0x9400, 0x9408,
 		0x9410, 0x9458,
 		0x9600, 0x9600,
 		0x9608, 0x9638,
 		0x9640, 0x96bc,
 		0x9800, 0x9808,
 		0x9820, 0x983c,
 		0x9850, 0x9864,
 		0x9c00, 0x9c6c,
 		0x9c80, 0x9cec,
 		0x9d00, 0x9d6c,
 		0x9d80, 0x9dec,
 		0x9e00, 0x9e6c,
 		0x9e80, 0x9eec,
 		0x9f00, 0x9f6c,
 		0x9f80, 0x9fec,
 		0xd004, 0xd004,
 		0xd010, 0xd03c,
 		0xdfc0, 0xdfe0,
 		0xe000, 0xea7c,
 		0xf000, 0x11110,
 		0x11118, 0x11190,
 		0x19040, 0x1906c,
 		0x19078, 0x19080,
 		0x1908c, 0x190e4,
 		0x190f0, 0x190f8,
 		0x19100, 0x19110,
 		0x19120, 0x19124,
 		0x19150, 0x19194,
 		0x1919c, 0x191b0,
 		0x191d0, 0x191e8,
 		0x19238, 0x1924c,
 		0x193f8, 0x1943c,
 		0x1944c, 0x19474,
 		0x19490, 0x194e0,
 		0x194f0, 0x194f8,
 		0x19800, 0x19c08,
 		0x19c10, 0x19c90,
 		0x19ca0, 0x19ce4,
 		0x19cf0, 0x19d40,
 		0x19d50, 0x19d94,
 		0x19da0, 0x19de8,
 		0x19df0, 0x19e40,
 		0x19e50, 0x19e90,
 		0x19ea0, 0x19f4c,
 		0x1a000, 0x1a004,
 		0x1a010, 0x1a06c,
 		0x1a0b0, 0x1a0e4,
 		0x1a0ec, 0x1a0f4,
 		0x1a100, 0x1a108,
 		0x1a114, 0x1a120,
 		0x1a128, 0x1a130,
 		0x1a138, 0x1a138,
 		0x1a190, 0x1a1c4,
 		0x1a1fc, 0x1a1fc,
 		0x1e040, 0x1e04c,
 		0x1e284, 0x1e28c,
 		0x1e2c0, 0x1e2c0,
 		0x1e2e0, 0x1e2e0,
 		0x1e300, 0x1e384,
 		0x1e3c0, 0x1e3c8,
 		0x1e440, 0x1e44c,
 		0x1e684, 0x1e68c,
 		0x1e6c0, 0x1e6c0,
 		0x1e6e0, 0x1e6e0,
 		0x1e700, 0x1e784,
 		0x1e7c0, 0x1e7c8,
 		0x1e840, 0x1e84c,
 		0x1ea84, 0x1ea8c,
 		0x1eac0, 0x1eac0,
 		0x1eae0, 0x1eae0,
 		0x1eb00, 0x1eb84,
 		0x1ebc0, 0x1ebc8,
 		0x1ec40, 0x1ec4c,
 		0x1ee84, 0x1ee8c,
 		0x1eec0, 0x1eec0,
 		0x1eee0, 0x1eee0,
 		0x1ef00, 0x1ef84,
 		0x1efc0, 0x1efc8,
 		0x1f040, 0x1f04c,
 		0x1f284, 0x1f28c,
 		0x1f2c0, 0x1f2c0,
 		0x1f2e0, 0x1f2e0,
 		0x1f300, 0x1f384,
 		0x1f3c0, 0x1f3c8,
 		0x1f440, 0x1f44c,
 		0x1f684, 0x1f68c,
 		0x1f6c0, 0x1f6c0,
 		0x1f6e0, 0x1f6e0,
 		0x1f700, 0x1f784,
 		0x1f7c0, 0x1f7c8,
 		0x1f840, 0x1f84c,
 		0x1fa84, 0x1fa8c,
 		0x1fac0, 0x1fac0,
 		0x1fae0, 0x1fae0,
 		0x1fb00, 0x1fb84,
 		0x1fbc0, 0x1fbc8,
 		0x1fc40, 0x1fc4c,
 		0x1fe84, 0x1fe8c,
 		0x1fec0, 0x1fec0,
 		0x1fee0, 0x1fee0,
 		0x1ff00, 0x1ff84,
 		0x1ffc0, 0x1ffc8,
 		0x20000, 0x2002c,
 		0x20100, 0x2013c,
 		0x20190, 0x201a0,
 		0x201a8, 0x201b8,
 		0x201c4, 0x201c8,
 		0x20200, 0x20318,
 		0x20400, 0x204b4,
 		0x204c0, 0x20528,
 		0x20540, 0x20614,
 		0x21000, 0x21040,
 		0x2104c, 0x21060,
 		0x210c0, 0x210ec,
 		0x21200, 0x21268,
 		0x21270, 0x21284,
 		0x212fc, 0x21388,
 		0x21400, 0x21404,
 		0x21500, 0x21500,
 		0x21510, 0x21518,
 		0x2152c, 0x21530,
 		0x2153c, 0x2153c,
 		0x21550, 0x21554,
 		0x21600, 0x21600,
 		0x21608, 0x2161c,
 		0x21624, 0x21628,
 		0x21630, 0x21634,
 		0x2163c, 0x2163c,
 		0x21700, 0x2171c,
 		0x21780, 0x2178c,
 		0x21800, 0x21818,
 		0x21820, 0x21828,
 		0x21830, 0x21848,
 		0x21850, 0x21854,
 		0x21860, 0x21868,
 		0x21870, 0x21870,
 		0x21878, 0x21898,
 		0x218a0, 0x218a8,
 		0x218b0, 0x218c8,
 		0x218d0, 0x218d4,
 		0x218e0, 0x218e8,
 		0x218f0, 0x218f0,
 		0x218f8, 0x21a18,
 		0x21a20, 0x21a28,
 		0x21a30, 0x21a48,
 		0x21a50, 0x21a54,
 		0x21a60, 0x21a68,
 		0x21a70, 0x21a70,
 		0x21a78, 0x21a98,
 		0x21aa0, 0x21aa8,
 		0x21ab0, 0x21ac8,
 		0x21ad0, 0x21ad4,
 		0x21ae0, 0x21ae8,
 		0x21af0, 0x21af0,
 		0x21af8, 0x21c18,
 		0x21c20, 0x21c20,
 		0x21c28, 0x21c30,
 		0x21c38, 0x21c38,
 		0x21c80, 0x21c98,
 		0x21ca0, 0x21ca8,
 		0x21cb0, 0x21cc8,
 		0x21cd0, 0x21cd4,
 		0x21ce0, 0x21ce8,
 		0x21cf0, 0x21cf0,
 		0x21cf8, 0x21d7c,
 		0x21e00, 0x21e04,
 		0x22000, 0x2202c,
 		0x22100, 0x2213c,
 		0x22190, 0x221a0,
 		0x221a8, 0x221b8,
 		0x221c4, 0x221c8,
 		0x22200, 0x22318,
 		0x22400, 0x224b4,
 		0x224c0, 0x22528,
 		0x22540, 0x22614,
 		0x23000, 0x23040,
 		0x2304c, 0x23060,
 		0x230c0, 0x230ec,
 		0x23200, 0x23268,
 		0x23270, 0x23284,
 		0x232fc, 0x23388,
 		0x23400, 0x23404,
 		0x23500, 0x23500,
 		0x23510, 0x23518,
 		0x2352c, 0x23530,
 		0x2353c, 0x2353c,
 		0x23550, 0x23554,
 		0x23600, 0x23600,
 		0x23608, 0x2361c,
 		0x23624, 0x23628,
 		0x23630, 0x23634,
 		0x2363c, 0x2363c,
 		0x23700, 0x2371c,
 		0x23780, 0x2378c,
 		0x23800, 0x23818,
 		0x23820, 0x23828,
 		0x23830, 0x23848,
 		0x23850, 0x23854,
 		0x23860, 0x23868,
 		0x23870, 0x23870,
 		0x23878, 0x23898,
 		0x238a0, 0x238a8,
 		0x238b0, 0x238c8,
 		0x238d0, 0x238d4,
 		0x238e0, 0x238e8,
 		0x238f0, 0x238f0,
 		0x238f8, 0x23a18,
 		0x23a20, 0x23a28,
 		0x23a30, 0x23a48,
 		0x23a50, 0x23a54,
 		0x23a60, 0x23a68,
 		0x23a70, 0x23a70,
 		0x23a78, 0x23a98,
 		0x23aa0, 0x23aa8,
 		0x23ab0, 0x23ac8,
 		0x23ad0, 0x23ad4,
 		0x23ae0, 0x23ae8,
 		0x23af0, 0x23af0,
 		0x23af8, 0x23c18,
 		0x23c20, 0x23c20,
 		0x23c28, 0x23c30,
 		0x23c38, 0x23c38,
 		0x23c80, 0x23c98,
 		0x23ca0, 0x23ca8,
 		0x23cb0, 0x23cc8,
 		0x23cd0, 0x23cd4,
 		0x23ce0, 0x23ce8,
 		0x23cf0, 0x23cf0,
 		0x23cf8, 0x23d7c,
 		0x23e00, 0x23e04,
 		0x24000, 0x2402c,
 		0x24100, 0x2413c,
 		0x24190, 0x241a0,
 		0x241a8, 0x241b8,
 		0x241c4, 0x241c8,
 		0x24200, 0x24318,
 		0x24400, 0x244b4,
 		0x244c0, 0x24528,
 		0x24540, 0x24614,
 		0x25000, 0x25040,
 		0x2504c, 0x25060,
 		0x250c0, 0x250ec,
 		0x25200, 0x25268,
 		0x25270, 0x25284,
 		0x252fc, 0x25388,
 		0x25400, 0x25404,
 		0x25500, 0x25500,
 		0x25510, 0x25518,
 		0x2552c, 0x25530,
 		0x2553c, 0x2553c,
 		0x25550, 0x25554,
 		0x25600, 0x25600,
 		0x25608, 0x2561c,
 		0x25624, 0x25628,
 		0x25630, 0x25634,
 		0x2563c, 0x2563c,
 		0x25700, 0x2571c,
 		0x25780, 0x2578c,
 		0x25800, 0x25818,
 		0x25820, 0x25828,
 		0x25830, 0x25848,
 		0x25850, 0x25854,
 		0x25860, 0x25868,
 		0x25870, 0x25870,
 		0x25878, 0x25898,
 		0x258a0, 0x258a8,
 		0x258b0, 0x258c8,
 		0x258d0, 0x258d4,
 		0x258e0, 0x258e8,
 		0x258f0, 0x258f0,
 		0x258f8, 0x25a18,
 		0x25a20, 0x25a28,
 		0x25a30, 0x25a48,
 		0x25a50, 0x25a54,
 		0x25a60, 0x25a68,
 		0x25a70, 0x25a70,
 		0x25a78, 0x25a98,
 		0x25aa0, 0x25aa8,
 		0x25ab0, 0x25ac8,
 		0x25ad0, 0x25ad4,
 		0x25ae0, 0x25ae8,
 		0x25af0, 0x25af0,
 		0x25af8, 0x25c18,
 		0x25c20, 0x25c20,
 		0x25c28, 0x25c30,
 		0x25c38, 0x25c38,
 		0x25c80, 0x25c98,
 		0x25ca0, 0x25ca8,
 		0x25cb0, 0x25cc8,
 		0x25cd0, 0x25cd4,
 		0x25ce0, 0x25ce8,
 		0x25cf0, 0x25cf0,
 		0x25cf8, 0x25d7c,
 		0x25e00, 0x25e04,
 		0x26000, 0x2602c,
 		0x26100, 0x2613c,
 		0x26190, 0x261a0,
 		0x261a8, 0x261b8,
 		0x261c4, 0x261c8,
 		0x26200, 0x26318,
 		0x26400, 0x264b4,
 		0x264c0, 0x26528,
 		0x26540, 0x26614,
 		0x27000, 0x27040,
 		0x2704c, 0x27060,
 		0x270c0, 0x270ec,
 		0x27200, 0x27268,
 		0x27270, 0x27284,
 		0x272fc, 0x27388,
 		0x27400, 0x27404,
 		0x27500, 0x27500,
 		0x27510, 0x27518,
 		0x2752c, 0x27530,
 		0x2753c, 0x2753c,
 		0x27550, 0x27554,
 		0x27600, 0x27600,
 		0x27608, 0x2761c,
 		0x27624, 0x27628,
 		0x27630, 0x27634,
 		0x2763c, 0x2763c,
 		0x27700, 0x2771c,
 		0x27780, 0x2778c,
 		0x27800, 0x27818,
 		0x27820, 0x27828,
 		0x27830, 0x27848,
 		0x27850, 0x27854,
 		0x27860, 0x27868,
 		0x27870, 0x27870,
 		0x27878, 0x27898,
 		0x278a0, 0x278a8,
 		0x278b0, 0x278c8,
 		0x278d0, 0x278d4,
 		0x278e0, 0x278e8,
 		0x278f0, 0x278f0,
 		0x278f8, 0x27a18,
 		0x27a20, 0x27a28,
 		0x27a30, 0x27a48,
 		0x27a50, 0x27a54,
 		0x27a60, 0x27a68,
 		0x27a70, 0x27a70,
 		0x27a78, 0x27a98,
 		0x27aa0, 0x27aa8,
 		0x27ab0, 0x27ac8,
 		0x27ad0, 0x27ad4,
 		0x27ae0, 0x27ae8,
 		0x27af0, 0x27af0,
 		0x27af8, 0x27c18,
 		0x27c20, 0x27c20,
 		0x27c28, 0x27c30,
 		0x27c38, 0x27c38,
 		0x27c80, 0x27c98,
 		0x27ca0, 0x27ca8,
 		0x27cb0, 0x27cc8,
 		0x27cd0, 0x27cd4,
 		0x27ce0, 0x27ce8,
 		0x27cf0, 0x27cf0,
 		0x27cf8, 0x27d7c,
 		0x27e00, 0x27e04,
 	};
 
 	static const unsigned int t4vf_reg_ranges[] = {
 		VF_SGE_REG(A_SGE_VF_KDOORBELL), VF_SGE_REG(A_SGE_VF_GTS),
 		VF_MPS_REG(A_MPS_VF_CTL),
 		VF_MPS_REG(A_MPS_VF_STAT_RX_VF_ERR_FRAMES_H),
 		VF_PL_REG(A_PL_VF_WHOAMI), VF_PL_REG(A_PL_VF_WHOAMI),
 		VF_CIM_REG(A_CIM_VF_EXT_MAILBOX_CTRL),
 		VF_CIM_REG(A_CIM_VF_EXT_MAILBOX_STATUS),
 		FW_T4VF_MBDATA_BASE_ADDR,
 		FW_T4VF_MBDATA_BASE_ADDR +
 		((NUM_CIM_PF_MAILBOX_DATA_INSTANCES - 1) * 4),
 	};
 
 	static const unsigned int t5_reg_ranges[] = {
 		0x1008, 0x10c0,
 		0x10cc, 0x10f8,
 		0x1100, 0x1100,
 		0x110c, 0x1148,
 		0x1180, 0x1184,
 		0x1190, 0x1194,
 		0x11a0, 0x11a4,
 		0x11b0, 0x11b4,
 		0x11fc, 0x123c,
 		0x1280, 0x173c,
 		0x1800, 0x18fc,
 		0x3000, 0x3028,
 		0x3060, 0x30b0,
 		0x30b8, 0x30d8,
 		0x30e0, 0x30fc,
 		0x3140, 0x357c,
 		0x35a8, 0x35cc,
 		0x35ec, 0x35ec,
 		0x3600, 0x5624,
 		0x56cc, 0x56ec,
 		0x56f4, 0x5720,
 		0x5728, 0x575c,
 		0x580c, 0x5814,
 		0x5890, 0x589c,
 		0x58a4, 0x58ac,
 		0x58b8, 0x58bc,
 		0x5940, 0x59c8,
 		0x59d0, 0x59dc,
 		0x59fc, 0x5a18,
 		0x5a60, 0x5a70,
 		0x5a80, 0x5a9c,
 		0x5b94, 0x5bfc,
 		0x6000, 0x6020,
 		0x6028, 0x6040,
 		0x6058, 0x609c,
 		0x60a8, 0x614c,
 		0x7700, 0x7798,
 		0x77c0, 0x78fc,
 		0x7b00, 0x7b58,
 		0x7b60, 0x7b84,
 		0x7b8c, 0x7c54,
 		0x7d00, 0x7d38,
 		0x7d40, 0x7d80,
 		0x7d8c, 0x7ddc,
 		0x7de4, 0x7e04,
 		0x7e10, 0x7e1c,
 		0x7e24, 0x7e38,
 		0x7e40, 0x7e44,
 		0x7e4c, 0x7e78,
 		0x7e80, 0x7edc,
 		0x7ee8, 0x7efc,
 		0x8dc0, 0x8de0,
 		0x8df8, 0x8e04,
 		0x8e10, 0x8e84,
 		0x8ea0, 0x8f84,
 		0x8fc0, 0x9058,
 		0x9060, 0x9060,
 		0x9068, 0x90f8,
 		0x9400, 0x9408,
 		0x9410, 0x9470,
 		0x9600, 0x9600,
 		0x9608, 0x9638,
 		0x9640, 0x96f4,
 		0x9800, 0x9808,
 		0x9820, 0x983c,
 		0x9850, 0x9864,
 		0x9c00, 0x9c6c,
 		0x9c80, 0x9cec,
 		0x9d00, 0x9d6c,
 		0x9d80, 0x9dec,
 		0x9e00, 0x9e6c,
 		0x9e80, 0x9eec,
 		0x9f00, 0x9f6c,
 		0x9f80, 0xa020,
 		0xd004, 0xd004,
 		0xd010, 0xd03c,
 		0xdfc0, 0xdfe0,
 		0xe000, 0x1106c,
 		0x11074, 0x11088,
 		0x1109c, 0x1117c,
 		0x11190, 0x11204,
 		0x19040, 0x1906c,
 		0x19078, 0x19080,
 		0x1908c, 0x190e8,
 		0x190f0, 0x190f8,
 		0x19100, 0x19110,
 		0x19120, 0x19124,
 		0x19150, 0x19194,
 		0x1919c, 0x191b0,
 		0x191d0, 0x191e8,
 		0x19238, 0x19290,
 		0x193f8, 0x19428,
 		0x19430, 0x19444,
 		0x1944c, 0x1946c,
 		0x19474, 0x19474,
 		0x19490, 0x194cc,
 		0x194f0, 0x194f8,
 		0x19c00, 0x19c08,
 		0x19c10, 0x19c60,
 		0x19c94, 0x19ce4,
 		0x19cf0, 0x19d40,
 		0x19d50, 0x19d94,
 		0x19da0, 0x19de8,
 		0x19df0, 0x19e10,
 		0x19e50, 0x19e90,
 		0x19ea0, 0x19f24,
 		0x19f34, 0x19f34,
 		0x19f40, 0x19f50,
 		0x19f90, 0x19fb4,
 		0x19fc4, 0x19fe4,
 		0x1a000, 0x1a004,
 		0x1a010, 0x1a06c,
 		0x1a0b0, 0x1a0e4,
 		0x1a0ec, 0x1a0f8,
 		0x1a100, 0x1a108,
 		0x1a114, 0x1a120,
 		0x1a128, 0x1a130,
 		0x1a138, 0x1a138,
 		0x1a190, 0x1a1c4,
 		0x1a1fc, 0x1a1fc,
 		0x1e008, 0x1e00c,
 		0x1e040, 0x1e044,
 		0x1e04c, 0x1e04c,
 		0x1e284, 0x1e290,
 		0x1e2c0, 0x1e2c0,
 		0x1e2e0, 0x1e2e0,
 		0x1e300, 0x1e384,
 		0x1e3c0, 0x1e3c8,
 		0x1e408, 0x1e40c,
 		0x1e440, 0x1e444,
 		0x1e44c, 0x1e44c,
 		0x1e684, 0x1e690,
 		0x1e6c0, 0x1e6c0,
 		0x1e6e0, 0x1e6e0,
 		0x1e700, 0x1e784,
 		0x1e7c0, 0x1e7c8,
 		0x1e808, 0x1e80c,
 		0x1e840, 0x1e844,
 		0x1e84c, 0x1e84c,
 		0x1ea84, 0x1ea90,
 		0x1eac0, 0x1eac0,
 		0x1eae0, 0x1eae0,
 		0x1eb00, 0x1eb84,
 		0x1ebc0, 0x1ebc8,
 		0x1ec08, 0x1ec0c,
 		0x1ec40, 0x1ec44,
 		0x1ec4c, 0x1ec4c,
 		0x1ee84, 0x1ee90,
 		0x1eec0, 0x1eec0,
 		0x1eee0, 0x1eee0,
 		0x1ef00, 0x1ef84,
 		0x1efc0, 0x1efc8,
 		0x1f008, 0x1f00c,
 		0x1f040, 0x1f044,
 		0x1f04c, 0x1f04c,
 		0x1f284, 0x1f290,
 		0x1f2c0, 0x1f2c0,
 		0x1f2e0, 0x1f2e0,
 		0x1f300, 0x1f384,
 		0x1f3c0, 0x1f3c8,
 		0x1f408, 0x1f40c,
 		0x1f440, 0x1f444,
 		0x1f44c, 0x1f44c,
 		0x1f684, 0x1f690,
 		0x1f6c0, 0x1f6c0,
 		0x1f6e0, 0x1f6e0,
 		0x1f700, 0x1f784,
 		0x1f7c0, 0x1f7c8,
 		0x1f808, 0x1f80c,
 		0x1f840, 0x1f844,
 		0x1f84c, 0x1f84c,
 		0x1fa84, 0x1fa90,
 		0x1fac0, 0x1fac0,
 		0x1fae0, 0x1fae0,
 		0x1fb00, 0x1fb84,
 		0x1fbc0, 0x1fbc8,
 		0x1fc08, 0x1fc0c,
 		0x1fc40, 0x1fc44,
 		0x1fc4c, 0x1fc4c,
 		0x1fe84, 0x1fe90,
 		0x1fec0, 0x1fec0,
 		0x1fee0, 0x1fee0,
 		0x1ff00, 0x1ff84,
 		0x1ffc0, 0x1ffc8,
 		0x30000, 0x30030,
 		0x30100, 0x30144,
 		0x30190, 0x301a0,
 		0x301a8, 0x301b8,
 		0x301c4, 0x301c8,
 		0x301d0, 0x301d0,
 		0x30200, 0x30318,
 		0x30400, 0x304b4,
 		0x304c0, 0x3052c,
 		0x30540, 0x3061c,
 		0x30800, 0x30828,
 		0x30834, 0x30834,
 		0x308c0, 0x30908,
 		0x30910, 0x309ac,
 		0x30a00, 0x30a14,
 		0x30a1c, 0x30a2c,
 		0x30a44, 0x30a50,
 		0x30a74, 0x30a74,
 		0x30a7c, 0x30afc,
 		0x30b08, 0x30c24,
 		0x30d00, 0x30d00,
 		0x30d08, 0x30d14,
 		0x30d1c, 0x30d20,
 		0x30d3c, 0x30d3c,
 		0x30d48, 0x30d50,
 		0x31200, 0x3120c,
 		0x31220, 0x31220,
 		0x31240, 0x31240,
 		0x31600, 0x3160c,
 		0x31a00, 0x31a1c,
 		0x31e00, 0x31e20,
 		0x31e38, 0x31e3c,
 		0x31e80, 0x31e80,
 		0x31e88, 0x31ea8,
 		0x31eb0, 0x31eb4,
 		0x31ec8, 0x31ed4,
 		0x31fb8, 0x32004,
 		0x32200, 0x32200,
 		0x32208, 0x32240,
 		0x32248, 0x32280,
 		0x32288, 0x322c0,
 		0x322c8, 0x322fc,
 		0x32600, 0x32630,
 		0x32a00, 0x32abc,
 		0x32b00, 0x32b10,
 		0x32b20, 0x32b30,
 		0x32b40, 0x32b50,
 		0x32b60, 0x32b70,
 		0x33000, 0x33028,
 		0x33030, 0x33048,
 		0x33060, 0x33068,
 		0x33070, 0x3309c,
 		0x330f0, 0x33128,
 		0x33130, 0x33148,
 		0x33160, 0x33168,
 		0x33170, 0x3319c,
 		0x331f0, 0x33238,
 		0x33240, 0x33240,
 		0x33248, 0x33250,
 		0x3325c, 0x33264,
 		0x33270, 0x332b8,
 		0x332c0, 0x332e4,
 		0x332f8, 0x33338,
 		0x33340, 0x33340,
 		0x33348, 0x33350,
 		0x3335c, 0x33364,
 		0x33370, 0x333b8,
 		0x333c0, 0x333e4,
 		0x333f8, 0x33428,
 		0x33430, 0x33448,
 		0x33460, 0x33468,
 		0x33470, 0x3349c,
 		0x334f0, 0x33528,
 		0x33530, 0x33548,
 		0x33560, 0x33568,
 		0x33570, 0x3359c,
 		0x335f0, 0x33638,
 		0x33640, 0x33640,
 		0x33648, 0x33650,
 		0x3365c, 0x33664,
 		0x33670, 0x336b8,
 		0x336c0, 0x336e4,
 		0x336f8, 0x33738,
 		0x33740, 0x33740,
 		0x33748, 0x33750,
 		0x3375c, 0x33764,
 		0x33770, 0x337b8,
 		0x337c0, 0x337e4,
 		0x337f8, 0x337fc,
 		0x33814, 0x33814,
 		0x3382c, 0x3382c,
 		0x33880, 0x3388c,
 		0x338e8, 0x338ec,
 		0x33900, 0x33928,
 		0x33930, 0x33948,
 		0x33960, 0x33968,
 		0x33970, 0x3399c,
 		0x339f0, 0x33a38,
 		0x33a40, 0x33a40,
 		0x33a48, 0x33a50,
 		0x33a5c, 0x33a64,
 		0x33a70, 0x33ab8,
 		0x33ac0, 0x33ae4,
 		0x33af8, 0x33b10,
 		0x33b28, 0x33b28,
 		0x33b3c, 0x33b50,
 		0x33bf0, 0x33c10,
 		0x33c28, 0x33c28,
 		0x33c3c, 0x33c50,
 		0x33cf0, 0x33cfc,
 		0x34000, 0x34030,
 		0x34100, 0x34144,
 		0x34190, 0x341a0,
 		0x341a8, 0x341b8,
 		0x341c4, 0x341c8,
 		0x341d0, 0x341d0,
 		0x34200, 0x34318,
 		0x34400, 0x344b4,
 		0x344c0, 0x3452c,
 		0x34540, 0x3461c,
 		0x34800, 0x34828,
 		0x34834, 0x34834,
 		0x348c0, 0x34908,
 		0x34910, 0x349ac,
 		0x34a00, 0x34a14,
 		0x34a1c, 0x34a2c,
 		0x34a44, 0x34a50,
 		0x34a74, 0x34a74,
 		0x34a7c, 0x34afc,
 		0x34b08, 0x34c24,
 		0x34d00, 0x34d00,
 		0x34d08, 0x34d14,
 		0x34d1c, 0x34d20,
 		0x34d3c, 0x34d3c,
 		0x34d48, 0x34d50,
 		0x35200, 0x3520c,
 		0x35220, 0x35220,
 		0x35240, 0x35240,
 		0x35600, 0x3560c,
 		0x35a00, 0x35a1c,
 		0x35e00, 0x35e20,
 		0x35e38, 0x35e3c,
 		0x35e80, 0x35e80,
 		0x35e88, 0x35ea8,
 		0x35eb0, 0x35eb4,
 		0x35ec8, 0x35ed4,
 		0x35fb8, 0x36004,
 		0x36200, 0x36200,
 		0x36208, 0x36240,
 		0x36248, 0x36280,
 		0x36288, 0x362c0,
 		0x362c8, 0x362fc,
 		0x36600, 0x36630,
 		0x36a00, 0x36abc,
 		0x36b00, 0x36b10,
 		0x36b20, 0x36b30,
 		0x36b40, 0x36b50,
 		0x36b60, 0x36b70,
 		0x37000, 0x37028,
 		0x37030, 0x37048,
 		0x37060, 0x37068,
 		0x37070, 0x3709c,
 		0x370f0, 0x37128,
 		0x37130, 0x37148,
 		0x37160, 0x37168,
 		0x37170, 0x3719c,
 		0x371f0, 0x37238,
 		0x37240, 0x37240,
 		0x37248, 0x37250,
 		0x3725c, 0x37264,
 		0x37270, 0x372b8,
 		0x372c0, 0x372e4,
 		0x372f8, 0x37338,
 		0x37340, 0x37340,
 		0x37348, 0x37350,
 		0x3735c, 0x37364,
 		0x37370, 0x373b8,
 		0x373c0, 0x373e4,
 		0x373f8, 0x37428,
 		0x37430, 0x37448,
 		0x37460, 0x37468,
 		0x37470, 0x3749c,
 		0x374f0, 0x37528,
 		0x37530, 0x37548,
 		0x37560, 0x37568,
 		0x37570, 0x3759c,
 		0x375f0, 0x37638,
 		0x37640, 0x37640,
 		0x37648, 0x37650,
 		0x3765c, 0x37664,
 		0x37670, 0x376b8,
 		0x376c0, 0x376e4,
 		0x376f8, 0x37738,
 		0x37740, 0x37740,
 		0x37748, 0x37750,
 		0x3775c, 0x37764,
 		0x37770, 0x377b8,
 		0x377c0, 0x377e4,
 		0x377f8, 0x377fc,
 		0x37814, 0x37814,
 		0x3782c, 0x3782c,
 		0x37880, 0x3788c,
 		0x378e8, 0x378ec,
 		0x37900, 0x37928,
 		0x37930, 0x37948,
 		0x37960, 0x37968,
 		0x37970, 0x3799c,
 		0x379f0, 0x37a38,
 		0x37a40, 0x37a40,
 		0x37a48, 0x37a50,
 		0x37a5c, 0x37a64,
 		0x37a70, 0x37ab8,
 		0x37ac0, 0x37ae4,
 		0x37af8, 0x37b10,
 		0x37b28, 0x37b28,
 		0x37b3c, 0x37b50,
 		0x37bf0, 0x37c10,
 		0x37c28, 0x37c28,
 		0x37c3c, 0x37c50,
 		0x37cf0, 0x37cfc,
 		0x38000, 0x38030,
 		0x38100, 0x38144,
 		0x38190, 0x381a0,
 		0x381a8, 0x381b8,
 		0x381c4, 0x381c8,
 		0x381d0, 0x381d0,
 		0x38200, 0x38318,
 		0x38400, 0x384b4,
 		0x384c0, 0x3852c,
 		0x38540, 0x3861c,
 		0x38800, 0x38828,
 		0x38834, 0x38834,
 		0x388c0, 0x38908,
 		0x38910, 0x389ac,
 		0x38a00, 0x38a14,
 		0x38a1c, 0x38a2c,
 		0x38a44, 0x38a50,
 		0x38a74, 0x38a74,
 		0x38a7c, 0x38afc,
 		0x38b08, 0x38c24,
 		0x38d00, 0x38d00,
 		0x38d08, 0x38d14,
 		0x38d1c, 0x38d20,
 		0x38d3c, 0x38d3c,
 		0x38d48, 0x38d50,
 		0x39200, 0x3920c,
 		0x39220, 0x39220,
 		0x39240, 0x39240,
 		0x39600, 0x3960c,
 		0x39a00, 0x39a1c,
 		0x39e00, 0x39e20,
 		0x39e38, 0x39e3c,
 		0x39e80, 0x39e80,
 		0x39e88, 0x39ea8,
 		0x39eb0, 0x39eb4,
 		0x39ec8, 0x39ed4,
 		0x39fb8, 0x3a004,
 		0x3a200, 0x3a200,
 		0x3a208, 0x3a240,
 		0x3a248, 0x3a280,
 		0x3a288, 0x3a2c0,
 		0x3a2c8, 0x3a2fc,
 		0x3a600, 0x3a630,
 		0x3aa00, 0x3aabc,
 		0x3ab00, 0x3ab10,
 		0x3ab20, 0x3ab30,
 		0x3ab40, 0x3ab50,
 		0x3ab60, 0x3ab70,
 		0x3b000, 0x3b028,
 		0x3b030, 0x3b048,
 		0x3b060, 0x3b068,
 		0x3b070, 0x3b09c,
 		0x3b0f0, 0x3b128,
 		0x3b130, 0x3b148,
 		0x3b160, 0x3b168,
 		0x3b170, 0x3b19c,
 		0x3b1f0, 0x3b238,
 		0x3b240, 0x3b240,
 		0x3b248, 0x3b250,
 		0x3b25c, 0x3b264,
 		0x3b270, 0x3b2b8,
 		0x3b2c0, 0x3b2e4,
 		0x3b2f8, 0x3b338,
 		0x3b340, 0x3b340,
 		0x3b348, 0x3b350,
 		0x3b35c, 0x3b364,
 		0x3b370, 0x3b3b8,
 		0x3b3c0, 0x3b3e4,
 		0x3b3f8, 0x3b428,
 		0x3b430, 0x3b448,
 		0x3b460, 0x3b468,
 		0x3b470, 0x3b49c,
 		0x3b4f0, 0x3b528,
 		0x3b530, 0x3b548,
 		0x3b560, 0x3b568,
 		0x3b570, 0x3b59c,
 		0x3b5f0, 0x3b638,
 		0x3b640, 0x3b640,
 		0x3b648, 0x3b650,
 		0x3b65c, 0x3b664,
 		0x3b670, 0x3b6b8,
 		0x3b6c0, 0x3b6e4,
 		0x3b6f8, 0x3b738,
 		0x3b740, 0x3b740,
 		0x3b748, 0x3b750,
 		0x3b75c, 0x3b764,
 		0x3b770, 0x3b7b8,
 		0x3b7c0, 0x3b7e4,
 		0x3b7f8, 0x3b7fc,
 		0x3b814, 0x3b814,
 		0x3b82c, 0x3b82c,
 		0x3b880, 0x3b88c,
 		0x3b8e8, 0x3b8ec,
 		0x3b900, 0x3b928,
 		0x3b930, 0x3b948,
 		0x3b960, 0x3b968,
 		0x3b970, 0x3b99c,
 		0x3b9f0, 0x3ba38,
 		0x3ba40, 0x3ba40,
 		0x3ba48, 0x3ba50,
 		0x3ba5c, 0x3ba64,
 		0x3ba70, 0x3bab8,
 		0x3bac0, 0x3bae4,
 		0x3baf8, 0x3bb10,
 		0x3bb28, 0x3bb28,
 		0x3bb3c, 0x3bb50,
 		0x3bbf0, 0x3bc10,
 		0x3bc28, 0x3bc28,
 		0x3bc3c, 0x3bc50,
 		0x3bcf0, 0x3bcfc,
 		0x3c000, 0x3c030,
 		0x3c100, 0x3c144,
 		0x3c190, 0x3c1a0,
 		0x3c1a8, 0x3c1b8,
 		0x3c1c4, 0x3c1c8,
 		0x3c1d0, 0x3c1d0,
 		0x3c200, 0x3c318,
 		0x3c400, 0x3c4b4,
 		0x3c4c0, 0x3c52c,
 		0x3c540, 0x3c61c,
 		0x3c800, 0x3c828,
 		0x3c834, 0x3c834,
 		0x3c8c0, 0x3c908,
 		0x3c910, 0x3c9ac,
 		0x3ca00, 0x3ca14,
 		0x3ca1c, 0x3ca2c,
 		0x3ca44, 0x3ca50,
 		0x3ca74, 0x3ca74,
 		0x3ca7c, 0x3cafc,
 		0x3cb08, 0x3cc24,
 		0x3cd00, 0x3cd00,
 		0x3cd08, 0x3cd14,
 		0x3cd1c, 0x3cd20,
 		0x3cd3c, 0x3cd3c,
 		0x3cd48, 0x3cd50,
 		0x3d200, 0x3d20c,
 		0x3d220, 0x3d220,
 		0x3d240, 0x3d240,
 		0x3d600, 0x3d60c,
 		0x3da00, 0x3da1c,
 		0x3de00, 0x3de20,
 		0x3de38, 0x3de3c,
 		0x3de80, 0x3de80,
 		0x3de88, 0x3dea8,
 		0x3deb0, 0x3deb4,
 		0x3dec8, 0x3ded4,
 		0x3dfb8, 0x3e004,
 		0x3e200, 0x3e200,
 		0x3e208, 0x3e240,
 		0x3e248, 0x3e280,
 		0x3e288, 0x3e2c0,
 		0x3e2c8, 0x3e2fc,
 		0x3e600, 0x3e630,
 		0x3ea00, 0x3eabc,
 		0x3eb00, 0x3eb10,
 		0x3eb20, 0x3eb30,
 		0x3eb40, 0x3eb50,
 		0x3eb60, 0x3eb70,
 		0x3f000, 0x3f028,
 		0x3f030, 0x3f048,
 		0x3f060, 0x3f068,
 		0x3f070, 0x3f09c,
 		0x3f0f0, 0x3f128,
 		0x3f130, 0x3f148,
 		0x3f160, 0x3f168,
 		0x3f170, 0x3f19c,
 		0x3f1f0, 0x3f238,
 		0x3f240, 0x3f240,
 		0x3f248, 0x3f250,
 		0x3f25c, 0x3f264,
 		0x3f270, 0x3f2b8,
 		0x3f2c0, 0x3f2e4,
 		0x3f2f8, 0x3f338,
 		0x3f340, 0x3f340,
 		0x3f348, 0x3f350,
 		0x3f35c, 0x3f364,
 		0x3f370, 0x3f3b8,
 		0x3f3c0, 0x3f3e4,
 		0x3f3f8, 0x3f428,
 		0x3f430, 0x3f448,
 		0x3f460, 0x3f468,
 		0x3f470, 0x3f49c,
 		0x3f4f0, 0x3f528,
 		0x3f530, 0x3f548,
 		0x3f560, 0x3f568,
 		0x3f570, 0x3f59c,
 		0x3f5f0, 0x3f638,
 		0x3f640, 0x3f640,
 		0x3f648, 0x3f650,
 		0x3f65c, 0x3f664,
 		0x3f670, 0x3f6b8,
 		0x3f6c0, 0x3f6e4,
 		0x3f6f8, 0x3f738,
 		0x3f740, 0x3f740,
 		0x3f748, 0x3f750,
 		0x3f75c, 0x3f764,
 		0x3f770, 0x3f7b8,
 		0x3f7c0, 0x3f7e4,
 		0x3f7f8, 0x3f7fc,
 		0x3f814, 0x3f814,
 		0x3f82c, 0x3f82c,
 		0x3f880, 0x3f88c,
 		0x3f8e8, 0x3f8ec,
 		0x3f900, 0x3f928,
 		0x3f930, 0x3f948,
 		0x3f960, 0x3f968,
 		0x3f970, 0x3f99c,
 		0x3f9f0, 0x3fa38,
 		0x3fa40, 0x3fa40,
 		0x3fa48, 0x3fa50,
 		0x3fa5c, 0x3fa64,
 		0x3fa70, 0x3fab8,
 		0x3fac0, 0x3fae4,
 		0x3faf8, 0x3fb10,
 		0x3fb28, 0x3fb28,
 		0x3fb3c, 0x3fb50,
 		0x3fbf0, 0x3fc10,
 		0x3fc28, 0x3fc28,
 		0x3fc3c, 0x3fc50,
 		0x3fcf0, 0x3fcfc,
 		0x40000, 0x4000c,
 		0x40040, 0x40050,
 		0x40060, 0x40068,
 		0x4007c, 0x4008c,
 		0x40094, 0x400b0,
 		0x400c0, 0x40144,
 		0x40180, 0x4018c,
 		0x40200, 0x40254,
 		0x40260, 0x40264,
 		0x40270, 0x40288,
 		0x40290, 0x40298,
 		0x402ac, 0x402c8,
 		0x402d0, 0x402e0,
 		0x402f0, 0x402f0,
 		0x40300, 0x4033c,
 		0x403f8, 0x403fc,
 		0x41304, 0x413c4,
 		0x41400, 0x4140c,
 		0x41414, 0x4141c,
 		0x41480, 0x414d0,
 		0x44000, 0x44054,
 		0x4405c, 0x44078,
 		0x440c0, 0x44174,
 		0x44180, 0x441ac,
 		0x441b4, 0x441b8,
 		0x441c0, 0x44254,
 		0x4425c, 0x44278,
 		0x442c0, 0x44374,
 		0x44380, 0x443ac,
 		0x443b4, 0x443b8,
 		0x443c0, 0x44454,
 		0x4445c, 0x44478,
 		0x444c0, 0x44574,
 		0x44580, 0x445ac,
 		0x445b4, 0x445b8,
 		0x445c0, 0x44654,
 		0x4465c, 0x44678,
 		0x446c0, 0x44774,
 		0x44780, 0x447ac,
 		0x447b4, 0x447b8,
 		0x447c0, 0x44854,
 		0x4485c, 0x44878,
 		0x448c0, 0x44974,
 		0x44980, 0x449ac,
 		0x449b4, 0x449b8,
 		0x449c0, 0x449fc,
 		0x45000, 0x45004,
 		0x45010, 0x45030,
 		0x45040, 0x45060,
 		0x45068, 0x45068,
 		0x45080, 0x45084,
 		0x450a0, 0x450b0,
 		0x45200, 0x45204,
 		0x45210, 0x45230,
 		0x45240, 0x45260,
 		0x45268, 0x45268,
 		0x45280, 0x45284,
 		0x452a0, 0x452b0,
 		0x460c0, 0x460e4,
 		0x47000, 0x4703c,
 		0x47044, 0x4708c,
 		0x47200, 0x47250,
 		0x47400, 0x47408,
 		0x47414, 0x47420,
 		0x47600, 0x47618,
 		0x47800, 0x47814,
 		0x48000, 0x4800c,
 		0x48040, 0x48050,
 		0x48060, 0x48068,
 		0x4807c, 0x4808c,
 		0x48094, 0x480b0,
 		0x480c0, 0x48144,
 		0x48180, 0x4818c,
 		0x48200, 0x48254,
 		0x48260, 0x48264,
 		0x48270, 0x48288,
 		0x48290, 0x48298,
 		0x482ac, 0x482c8,
 		0x482d0, 0x482e0,
 		0x482f0, 0x482f0,
 		0x48300, 0x4833c,
 		0x483f8, 0x483fc,
 		0x49304, 0x493c4,
 		0x49400, 0x4940c,
 		0x49414, 0x4941c,
 		0x49480, 0x494d0,
 		0x4c000, 0x4c054,
 		0x4c05c, 0x4c078,
 		0x4c0c0, 0x4c174,
 		0x4c180, 0x4c1ac,
 		0x4c1b4, 0x4c1b8,
 		0x4c1c0, 0x4c254,
 		0x4c25c, 0x4c278,
 		0x4c2c0, 0x4c374,
 		0x4c380, 0x4c3ac,
 		0x4c3b4, 0x4c3b8,
 		0x4c3c0, 0x4c454,
 		0x4c45c, 0x4c478,
 		0x4c4c0, 0x4c574,
 		0x4c580, 0x4c5ac,
 		0x4c5b4, 0x4c5b8,
 		0x4c5c0, 0x4c654,
 		0x4c65c, 0x4c678,
 		0x4c6c0, 0x4c774,
 		0x4c780, 0x4c7ac,
 		0x4c7b4, 0x4c7b8,
 		0x4c7c0, 0x4c854,
 		0x4c85c, 0x4c878,
 		0x4c8c0, 0x4c974,
 		0x4c980, 0x4c9ac,
 		0x4c9b4, 0x4c9b8,
 		0x4c9c0, 0x4c9fc,
 		0x4d000, 0x4d004,
 		0x4d010, 0x4d030,
 		0x4d040, 0x4d060,
 		0x4d068, 0x4d068,
 		0x4d080, 0x4d084,
 		0x4d0a0, 0x4d0b0,
 		0x4d200, 0x4d204,
 		0x4d210, 0x4d230,
 		0x4d240, 0x4d260,
 		0x4d268, 0x4d268,
 		0x4d280, 0x4d284,
 		0x4d2a0, 0x4d2b0,
 		0x4e0c0, 0x4e0e4,
 		0x4f000, 0x4f03c,
 		0x4f044, 0x4f08c,
 		0x4f200, 0x4f250,
 		0x4f400, 0x4f408,
 		0x4f414, 0x4f420,
 		0x4f600, 0x4f618,
 		0x4f800, 0x4f814,
 		0x50000, 0x50084,
 		0x50090, 0x500cc,
 		0x50400, 0x50400,
 		0x50800, 0x50884,
 		0x50890, 0x508cc,
 		0x50c00, 0x50c00,
 		0x51000, 0x5101c,
 		0x51300, 0x51308,
 	};
 
 	static const unsigned int t5vf_reg_ranges[] = {
 		VF_SGE_REG(A_SGE_VF_KDOORBELL), VF_SGE_REG(A_SGE_VF_GTS),
 		VF_MPS_REG(A_MPS_VF_CTL),
 		VF_MPS_REG(A_MPS_VF_STAT_RX_VF_ERR_FRAMES_H),
 		VF_PL_REG(A_PL_VF_WHOAMI), VF_PL_REG(A_PL_VF_REVISION),
 		VF_CIM_REG(A_CIM_VF_EXT_MAILBOX_CTRL),
 		VF_CIM_REG(A_CIM_VF_EXT_MAILBOX_STATUS),
 		FW_T4VF_MBDATA_BASE_ADDR,
 		FW_T4VF_MBDATA_BASE_ADDR +
 		((NUM_CIM_PF_MAILBOX_DATA_INSTANCES - 1) * 4),
 	};
 
 	static const unsigned int t6_reg_ranges[] = {
 		0x1008, 0x101c,
 		0x1024, 0x10a8,
 		0x10b4, 0x10f8,
 		0x1100, 0x1114,
 		0x111c, 0x112c,
 		0x1138, 0x113c,
 		0x1144, 0x114c,
 		0x1180, 0x1184,
 		0x1190, 0x1194,
 		0x11a0, 0x11a4,
 		0x11b0, 0x11b4,
 		0x11fc, 0x1274,
 		0x1280, 0x133c,
 		0x1800, 0x18fc,
 		0x3000, 0x302c,
 		0x3060, 0x30b0,
 		0x30b8, 0x30d8,
 		0x30e0, 0x30fc,
 		0x3140, 0x357c,
 		0x35a8, 0x35cc,
 		0x35ec, 0x35ec,
 		0x3600, 0x5624,
 		0x56cc, 0x56ec,
 		0x56f4, 0x5720,
 		0x5728, 0x575c,
 		0x580c, 0x5814,
 		0x5890, 0x589c,
 		0x58a4, 0x58ac,
 		0x58b8, 0x58bc,
 		0x5940, 0x595c,
 		0x5980, 0x598c,
 		0x59b0, 0x59c8,
 		0x59d0, 0x59dc,
 		0x59fc, 0x5a18,
 		0x5a60, 0x5a6c,
 		0x5a80, 0x5a8c,
 		0x5a94, 0x5a9c,
 		0x5b94, 0x5bfc,
 		0x5c10, 0x5e48,
 		0x5e50, 0x5e94,
 		0x5ea0, 0x5eb0,
 		0x5ec0, 0x5ec0,
 		0x5ec8, 0x5ed0,
 		0x5ee0, 0x5ee0,
 		0x5ef0, 0x5ef0,
 		0x5f00, 0x5f00,
 		0x6000, 0x6020,
 		0x6028, 0x6040,
 		0x6058, 0x609c,
 		0x60a8, 0x619c,
 		0x7700, 0x7798,
 		0x77c0, 0x7880,
 		0x78cc, 0x78fc,
 		0x7b00, 0x7b58,
 		0x7b60, 0x7b84,
 		0x7b8c, 0x7c54,
 		0x7d00, 0x7d38,
 		0x7d40, 0x7d84,
 		0x7d8c, 0x7ddc,
 		0x7de4, 0x7e04,
 		0x7e10, 0x7e1c,
 		0x7e24, 0x7e38,
 		0x7e40, 0x7e44,
 		0x7e4c, 0x7e78,
 		0x7e80, 0x7edc,
 		0x7ee8, 0x7efc,
 		0x8dc0, 0x8de4,
 		0x8df8, 0x8e04,
 		0x8e10, 0x8e84,
 		0x8ea0, 0x8f88,
 		0x8fb8, 0x9058,
 		0x9060, 0x9060,
 		0x9068, 0x90f8,
 		0x9100, 0x9124,
 		0x9400, 0x9470,
 		0x9600, 0x9600,
 		0x9608, 0x9638,
 		0x9640, 0x9704,
 		0x9710, 0x971c,
 		0x9800, 0x9808,
 		0x9820, 0x983c,
 		0x9850, 0x9864,
 		0x9c00, 0x9c6c,
 		0x9c80, 0x9cec,
 		0x9d00, 0x9d6c,
 		0x9d80, 0x9dec,
 		0x9e00, 0x9e6c,
 		0x9e80, 0x9eec,
 		0x9f00, 0x9f6c,
 		0x9f80, 0xa020,
 		0xd004, 0xd03c,
 		0xd100, 0xd118,
 		0xd200, 0xd214,
 		0xd220, 0xd234,
 		0xd240, 0xd254,
 		0xd260, 0xd274,
 		0xd280, 0xd294,
 		0xd2a0, 0xd2b4,
 		0xd2c0, 0xd2d4,
 		0xd2e0, 0xd2f4,
 		0xd300, 0xd31c,
 		0xdfc0, 0xdfe0,
 		0xe000, 0xf008,
 		0xf010, 0xf018,
 		0xf020, 0xf028,
 		0x11000, 0x11014,
 		0x11048, 0x1106c,
 		0x11074, 0x11088,
 		0x11098, 0x11120,
 		0x1112c, 0x1117c,
 		0x11190, 0x112e0,
 		0x11300, 0x1130c,
 		0x12000, 0x1206c,
 		0x19040, 0x1906c,
 		0x19078, 0x19080,
 		0x1908c, 0x190e8,
 		0x190f0, 0x190f8,
 		0x19100, 0x19110,
 		0x19120, 0x19124,
 		0x19150, 0x19194,
 		0x1919c, 0x191b0,
 		0x191d0, 0x191e8,
 		0x19238, 0x19290,
 		0x192a4, 0x192b0,
 		0x192bc, 0x192bc,
 		0x19348, 0x1934c,
 		0x193f8, 0x19418,
 		0x19420, 0x19428,
 		0x19430, 0x19444,
 		0x1944c, 0x1946c,
 		0x19474, 0x19474,
 		0x19490, 0x194cc,
 		0x194f0, 0x194f8,
 		0x19c00, 0x19c48,
 		0x19c50, 0x19c80,
 		0x19c94, 0x19c98,
 		0x19ca0, 0x19cbc,
 		0x19ce4, 0x19ce4,
 		0x19cf0, 0x19cf8,
 		0x19d00, 0x19d28,
 		0x19d50, 0x19d78,
 		0x19d94, 0x19d98,
 		0x19da0, 0x19dc8,
 		0x19df0, 0x19e10,
 		0x19e50, 0x19e6c,
 		0x19ea0, 0x19ebc,
 		0x19ec4, 0x19ef4,
 		0x19f04, 0x19f2c,
 		0x19f34, 0x19f34,
 		0x19f40, 0x19f50,
 		0x19f90, 0x19fac,
 		0x19fc4, 0x19fc8,
 		0x19fd0, 0x19fe4,
 		0x1a000, 0x1a004,
 		0x1a010, 0x1a06c,
 		0x1a0b0, 0x1a0e4,
 		0x1a0ec, 0x1a0f8,
 		0x1a100, 0x1a108,
 		0x1a114, 0x1a120,
 		0x1a128, 0x1a130,
 		0x1a138, 0x1a138,
 		0x1a190, 0x1a1c4,
 		0x1a1fc, 0x1a1fc,
 		0x1e008, 0x1e00c,
 		0x1e040, 0x1e044,
 		0x1e04c, 0x1e04c,
 		0x1e284, 0x1e290,
 		0x1e2c0, 0x1e2c0,
 		0x1e2e0, 0x1e2e0,
 		0x1e300, 0x1e384,
 		0x1e3c0, 0x1e3c8,
 		0x1e408, 0x1e40c,
 		0x1e440, 0x1e444,
 		0x1e44c, 0x1e44c,
 		0x1e684, 0x1e690,
 		0x1e6c0, 0x1e6c0,
 		0x1e6e0, 0x1e6e0,
 		0x1e700, 0x1e784,
 		0x1e7c0, 0x1e7c8,
 		0x1e808, 0x1e80c,
 		0x1e840, 0x1e844,
 		0x1e84c, 0x1e84c,
 		0x1ea84, 0x1ea90,
 		0x1eac0, 0x1eac0,
 		0x1eae0, 0x1eae0,
 		0x1eb00, 0x1eb84,
 		0x1ebc0, 0x1ebc8,
 		0x1ec08, 0x1ec0c,
 		0x1ec40, 0x1ec44,
 		0x1ec4c, 0x1ec4c,
 		0x1ee84, 0x1ee90,
 		0x1eec0, 0x1eec0,
 		0x1eee0, 0x1eee0,
 		0x1ef00, 0x1ef84,
 		0x1efc0, 0x1efc8,
 		0x1f008, 0x1f00c,
 		0x1f040, 0x1f044,
 		0x1f04c, 0x1f04c,
 		0x1f284, 0x1f290,
 		0x1f2c0, 0x1f2c0,
 		0x1f2e0, 0x1f2e0,
 		0x1f300, 0x1f384,
 		0x1f3c0, 0x1f3c8,
 		0x1f408, 0x1f40c,
 		0x1f440, 0x1f444,
 		0x1f44c, 0x1f44c,
 		0x1f684, 0x1f690,
 		0x1f6c0, 0x1f6c0,
 		0x1f6e0, 0x1f6e0,
 		0x1f700, 0x1f784,
 		0x1f7c0, 0x1f7c8,
 		0x1f808, 0x1f80c,
 		0x1f840, 0x1f844,
 		0x1f84c, 0x1f84c,
 		0x1fa84, 0x1fa90,
 		0x1fac0, 0x1fac0,
 		0x1fae0, 0x1fae0,
 		0x1fb00, 0x1fb84,
 		0x1fbc0, 0x1fbc8,
 		0x1fc08, 0x1fc0c,
 		0x1fc40, 0x1fc44,
 		0x1fc4c, 0x1fc4c,
 		0x1fe84, 0x1fe90,
 		0x1fec0, 0x1fec0,
 		0x1fee0, 0x1fee0,
 		0x1ff00, 0x1ff84,
 		0x1ffc0, 0x1ffc8,
 		0x30000, 0x30030,
 		0x30100, 0x30168,
 		0x30190, 0x301a0,
 		0x301a8, 0x301b8,
 		0x301c4, 0x301c8,
 		0x301d0, 0x301d0,
 		0x30200, 0x30320,
 		0x30400, 0x304b4,
 		0x304c0, 0x3052c,
 		0x30540, 0x3061c,
 		0x30800, 0x308a0,
 		0x308c0, 0x30908,
 		0x30910, 0x309b8,
 		0x30a00, 0x30a04,
 		0x30a0c, 0x30a14,
 		0x30a1c, 0x30a2c,
 		0x30a44, 0x30a50,
 		0x30a74, 0x30a74,
 		0x30a7c, 0x30afc,
 		0x30b08, 0x30c24,
 		0x30d00, 0x30d14,
 		0x30d1c, 0x30d3c,
 		0x30d44, 0x30d4c,
 		0x30d54, 0x30d74,
 		0x30d7c, 0x30d7c,
 		0x30de0, 0x30de0,
 		0x30e00, 0x30ed4,
 		0x30f00, 0x30fa4,
 		0x30fc0, 0x30fc4,
 		0x31000, 0x31004,
 		0x31080, 0x310fc,
 		0x31208, 0x31220,
 		0x3123c, 0x31254,
 		0x31300, 0x31300,
 		0x31308, 0x3131c,
 		0x31338, 0x3133c,
 		0x31380, 0x31380,
 		0x31388, 0x313a8,
 		0x313b4, 0x313b4,
 		0x31400, 0x31420,
 		0x31438, 0x3143c,
 		0x31480, 0x31480,
 		0x314a8, 0x314a8,
 		0x314b0, 0x314b4,
 		0x314c8, 0x314d4,
 		0x31a40, 0x31a4c,
 		0x31af0, 0x31b20,
 		0x31b38, 0x31b3c,
 		0x31b80, 0x31b80,
 		0x31ba8, 0x31ba8,
 		0x31bb0, 0x31bb4,
 		0x31bc8, 0x31bd4,
 		0x32140, 0x3218c,
 		0x321f0, 0x321f4,
 		0x32200, 0x32200,
 		0x32218, 0x32218,
 		0x32400, 0x32400,
 		0x32408, 0x3241c,
 		0x32618, 0x32620,
 		0x32664, 0x32664,
 		0x326a8, 0x326a8,
 		0x326ec, 0x326ec,
 		0x32a00, 0x32abc,
 		0x32b00, 0x32b18,
 		0x32b20, 0x32b38,
 		0x32b40, 0x32b58,
 		0x32b60, 0x32b78,
 		0x32c00, 0x32c00,
 		0x32c08, 0x32c3c,
 		0x33000, 0x3302c,
 		0x33034, 0x33050,
 		0x33058, 0x33058,
 		0x33060, 0x3308c,
 		0x3309c, 0x330ac,
 		0x330c0, 0x330c0,
 		0x330c8, 0x330d0,
 		0x330d8, 0x330e0,
 		0x330ec, 0x3312c,
 		0x33134, 0x33150,
 		0x33158, 0x33158,
 		0x33160, 0x3318c,
 		0x3319c, 0x331ac,
 		0x331c0, 0x331c0,
 		0x331c8, 0x331d0,
 		0x331d8, 0x331e0,
 		0x331ec, 0x33290,
 		0x33298, 0x332c4,
 		0x332e4, 0x33390,
 		0x33398, 0x333c4,
 		0x333e4, 0x3342c,
 		0x33434, 0x33450,
 		0x33458, 0x33458,
 		0x33460, 0x3348c,
 		0x3349c, 0x334ac,
 		0x334c0, 0x334c0,
 		0x334c8, 0x334d0,
 		0x334d8, 0x334e0,
 		0x334ec, 0x3352c,
 		0x33534, 0x33550,
 		0x33558, 0x33558,
 		0x33560, 0x3358c,
 		0x3359c, 0x335ac,
 		0x335c0, 0x335c0,
 		0x335c8, 0x335d0,
 		0x335d8, 0x335e0,
 		0x335ec, 0x33690,
 		0x33698, 0x336c4,
 		0x336e4, 0x33790,
 		0x33798, 0x337c4,
 		0x337e4, 0x337fc,
 		0x33814, 0x33814,
 		0x33854, 0x33868,
 		0x33880, 0x3388c,
 		0x338c0, 0x338d0,
 		0x338e8, 0x338ec,
 		0x33900, 0x3392c,
 		0x33934, 0x33950,
 		0x33958, 0x33958,
 		0x33960, 0x3398c,
 		0x3399c, 0x339ac,
 		0x339c0, 0x339c0,
 		0x339c8, 0x339d0,
 		0x339d8, 0x339e0,
 		0x339ec, 0x33a90,
 		0x33a98, 0x33ac4,
 		0x33ae4, 0x33b10,
 		0x33b24, 0x33b28,
 		0x33b38, 0x33b50,
 		0x33bf0, 0x33c10,
 		0x33c24, 0x33c28,
 		0x33c38, 0x33c50,
 		0x33cf0, 0x33cfc,
 		0x34000, 0x34030,
 		0x34100, 0x34168,
 		0x34190, 0x341a0,
 		0x341a8, 0x341b8,
 		0x341c4, 0x341c8,
 		0x341d0, 0x341d0,
 		0x34200, 0x34320,
 		0x34400, 0x344b4,
 		0x344c0, 0x3452c,
 		0x34540, 0x3461c,
 		0x34800, 0x348a0,
 		0x348c0, 0x34908,
 		0x34910, 0x349b8,
 		0x34a00, 0x34a04,
 		0x34a0c, 0x34a14,
 		0x34a1c, 0x34a2c,
 		0x34a44, 0x34a50,
 		0x34a74, 0x34a74,
 		0x34a7c, 0x34afc,
 		0x34b08, 0x34c24,
 		0x34d00, 0x34d14,
 		0x34d1c, 0x34d3c,
 		0x34d44, 0x34d4c,
 		0x34d54, 0x34d74,
 		0x34d7c, 0x34d7c,
 		0x34de0, 0x34de0,
 		0x34e00, 0x34ed4,
 		0x34f00, 0x34fa4,
 		0x34fc0, 0x34fc4,
 		0x35000, 0x35004,
 		0x35080, 0x350fc,
 		0x35208, 0x35220,
 		0x3523c, 0x35254,
 		0x35300, 0x35300,
 		0x35308, 0x3531c,
 		0x35338, 0x3533c,
 		0x35380, 0x35380,
 		0x35388, 0x353a8,
 		0x353b4, 0x353b4,
 		0x35400, 0x35420,
 		0x35438, 0x3543c,
 		0x35480, 0x35480,
 		0x354a8, 0x354a8,
 		0x354b0, 0x354b4,
 		0x354c8, 0x354d4,
 		0x35a40, 0x35a4c,
 		0x35af0, 0x35b20,
 		0x35b38, 0x35b3c,
 		0x35b80, 0x35b80,
 		0x35ba8, 0x35ba8,
 		0x35bb0, 0x35bb4,
 		0x35bc8, 0x35bd4,
 		0x36140, 0x3618c,
 		0x361f0, 0x361f4,
 		0x36200, 0x36200,
 		0x36218, 0x36218,
 		0x36400, 0x36400,
 		0x36408, 0x3641c,
 		0x36618, 0x36620,
 		0x36664, 0x36664,
 		0x366a8, 0x366a8,
 		0x366ec, 0x366ec,
 		0x36a00, 0x36abc,
 		0x36b00, 0x36b18,
 		0x36b20, 0x36b38,
 		0x36b40, 0x36b58,
 		0x36b60, 0x36b78,
 		0x36c00, 0x36c00,
 		0x36c08, 0x36c3c,
 		0x37000, 0x3702c,
 		0x37034, 0x37050,
 		0x37058, 0x37058,
 		0x37060, 0x3708c,
 		0x3709c, 0x370ac,
 		0x370c0, 0x370c0,
 		0x370c8, 0x370d0,
 		0x370d8, 0x370e0,
 		0x370ec, 0x3712c,
 		0x37134, 0x37150,
 		0x37158, 0x37158,
 		0x37160, 0x3718c,
 		0x3719c, 0x371ac,
 		0x371c0, 0x371c0,
 		0x371c8, 0x371d0,
 		0x371d8, 0x371e0,
 		0x371ec, 0x37290,
 		0x37298, 0x372c4,
 		0x372e4, 0x37390,
 		0x37398, 0x373c4,
 		0x373e4, 0x3742c,
 		0x37434, 0x37450,
 		0x37458, 0x37458,
 		0x37460, 0x3748c,
 		0x3749c, 0x374ac,
 		0x374c0, 0x374c0,
 		0x374c8, 0x374d0,
 		0x374d8, 0x374e0,
 		0x374ec, 0x3752c,
 		0x37534, 0x37550,
 		0x37558, 0x37558,
 		0x37560, 0x3758c,
 		0x3759c, 0x375ac,
 		0x375c0, 0x375c0,
 		0x375c8, 0x375d0,
 		0x375d8, 0x375e0,
 		0x375ec, 0x37690,
 		0x37698, 0x376c4,
 		0x376e4, 0x37790,
 		0x37798, 0x377c4,
 		0x377e4, 0x377fc,
 		0x37814, 0x37814,
 		0x37854, 0x37868,
 		0x37880, 0x3788c,
 		0x378c0, 0x378d0,
 		0x378e8, 0x378ec,
 		0x37900, 0x3792c,
 		0x37934, 0x37950,
 		0x37958, 0x37958,
 		0x37960, 0x3798c,
 		0x3799c, 0x379ac,
 		0x379c0, 0x379c0,
 		0x379c8, 0x379d0,
 		0x379d8, 0x379e0,
 		0x379ec, 0x37a90,
 		0x37a98, 0x37ac4,
 		0x37ae4, 0x37b10,
 		0x37b24, 0x37b28,
 		0x37b38, 0x37b50,
 		0x37bf0, 0x37c10,
 		0x37c24, 0x37c28,
 		0x37c38, 0x37c50,
 		0x37cf0, 0x37cfc,
 		0x40040, 0x40040,
 		0x40080, 0x40084,
 		0x40100, 0x40100,
 		0x40140, 0x401bc,
 		0x40200, 0x40214,
 		0x40228, 0x40228,
 		0x40240, 0x40258,
 		0x40280, 0x40280,
 		0x40304, 0x40304,
 		0x40330, 0x4033c,
 		0x41304, 0x413c8,
 		0x413d0, 0x413dc,
 		0x413f0, 0x413f0,
 		0x41400, 0x4140c,
 		0x41414, 0x4141c,
 		0x41480, 0x414d0,
 		0x44000, 0x4407c,
 		0x440c0, 0x441ac,
 		0x441b4, 0x4427c,
 		0x442c0, 0x443ac,
 		0x443b4, 0x4447c,
 		0x444c0, 0x445ac,
 		0x445b4, 0x4467c,
 		0x446c0, 0x447ac,
 		0x447b4, 0x4487c,
 		0x448c0, 0x449ac,
 		0x449b4, 0x44a7c,
 		0x44ac0, 0x44bac,
 		0x44bb4, 0x44c7c,
 		0x44cc0, 0x44dac,
 		0x44db4, 0x44e7c,
 		0x44ec0, 0x44fac,
 		0x44fb4, 0x4507c,
 		0x450c0, 0x451ac,
 		0x451b4, 0x451fc,
 		0x45800, 0x45804,
 		0x45810, 0x45830,
 		0x45840, 0x45860,
 		0x45868, 0x45868,
 		0x45880, 0x45884,
 		0x458a0, 0x458b0,
 		0x45a00, 0x45a04,
 		0x45a10, 0x45a30,
 		0x45a40, 0x45a60,
 		0x45a68, 0x45a68,
 		0x45a80, 0x45a84,
 		0x45aa0, 0x45ab0,
 		0x460c0, 0x460e4,
 		0x47000, 0x4703c,
 		0x47044, 0x4708c,
 		0x47200, 0x47250,
 		0x47400, 0x47408,
 		0x47414, 0x47420,
 		0x47600, 0x47618,
 		0x47800, 0x47814,
 		0x47820, 0x4782c,
 		0x50000, 0x50084,
 		0x50090, 0x500cc,
 		0x50300, 0x50384,
 		0x50400, 0x50400,
 		0x50800, 0x50884,
 		0x50890, 0x508cc,
 		0x50b00, 0x50b84,
 		0x50c00, 0x50c00,
 		0x51000, 0x51020,
 		0x51028, 0x510b0,
 		0x51300, 0x51324,
 	};
 
 	static const unsigned int t6vf_reg_ranges[] = {
 		VF_SGE_REG(A_SGE_VF_KDOORBELL), VF_SGE_REG(A_SGE_VF_GTS),
 		VF_MPS_REG(A_MPS_VF_CTL),
 		VF_MPS_REG(A_MPS_VF_STAT_RX_VF_ERR_FRAMES_H),
 		VF_PL_REG(A_PL_VF_WHOAMI), VF_PL_REG(A_PL_VF_REVISION),
 		VF_CIM_REG(A_CIM_VF_EXT_MAILBOX_CTRL),
 		VF_CIM_REG(A_CIM_VF_EXT_MAILBOX_STATUS),
 		FW_T6VF_MBDATA_BASE_ADDR,
 		FW_T6VF_MBDATA_BASE_ADDR +
 		((NUM_CIM_PF_MAILBOX_DATA_INSTANCES - 1) * 4),
 	};
 
 	u32 *buf_end = (u32 *)(buf + buf_size);
 	const unsigned int *reg_ranges;
 	int reg_ranges_size, range;
 	unsigned int chip_version = chip_id(adap);
 
 	/*
 	 * Select the right set of register ranges to dump depending on the
 	 * adapter chip type.
 	 */
 	switch (chip_version) {
 	case CHELSIO_T4:
 		if (adap->flags & IS_VF) {
 			reg_ranges = t4vf_reg_ranges;
 			reg_ranges_size = ARRAY_SIZE(t4vf_reg_ranges);
 		} else {
 			reg_ranges = t4_reg_ranges;
 			reg_ranges_size = ARRAY_SIZE(t4_reg_ranges);
 		}
 		break;
 
 	case CHELSIO_T5:
 		if (adap->flags & IS_VF) {
 			reg_ranges = t5vf_reg_ranges;
 			reg_ranges_size = ARRAY_SIZE(t5vf_reg_ranges);
 		} else {
 			reg_ranges = t5_reg_ranges;
 			reg_ranges_size = ARRAY_SIZE(t5_reg_ranges);
 		}
 		break;
 
 	case CHELSIO_T6:
 		if (adap->flags & IS_VF) {
 			reg_ranges = t6vf_reg_ranges;
 			reg_ranges_size = ARRAY_SIZE(t6vf_reg_ranges);
 		} else {
 			reg_ranges = t6_reg_ranges;
 			reg_ranges_size = ARRAY_SIZE(t6_reg_ranges);
 		}
 		break;
 
 	default:
 		CH_ERR(adap,
 			"Unsupported chip version %d\n", chip_version);
 		return;
 	}
 
 	/*
 	 * Clear the register buffer and insert the appropriate register
 	 * values selected by the above register ranges.
 	 */
 	memset(buf, 0, buf_size);
 	for (range = 0; range < reg_ranges_size; range += 2) {
 		unsigned int reg = reg_ranges[range];
 		unsigned int last_reg = reg_ranges[range + 1];
 		u32 *bufp = (u32 *)(buf + reg);
 
 		/*
 		 * Iterate across the register range filling in the register
 		 * buffer but don't write past the end of the register buffer.
 		 */
 		while (reg <= last_reg && bufp < buf_end) {
 			*bufp++ = t4_read_reg(adap, reg);
 			reg += sizeof(u32);
 		}
 	}
 }
 
 /*
  * Partial EEPROM Vital Product Data structure.  The VPD starts with one ID
  * header followed by one or more VPD-R sections, each with its own header.
  */
 struct t4_vpd_hdr {
 	u8  id_tag;
 	u8  id_len[2];
 	u8  id_data[ID_LEN];
 };
 
 struct t4_vpdr_hdr {
 	u8  vpdr_tag;
 	u8  vpdr_len[2];
 };
 
 /*
  * EEPROM reads take a few tens of us while writes can take a bit over 5 ms.
  */
 #define EEPROM_DELAY		10		/* 10us per poll spin */
 #define EEPROM_MAX_POLL		5000		/* x 5000 == 50ms */
 
 #define EEPROM_STAT_ADDR	0x7bfc
 #define VPD_SIZE		0x800
 #define VPD_BASE		0x400
 #define VPD_BASE_OLD		0
 #define VPD_LEN			1024
 #define VPD_INFO_FLD_HDR_SIZE	3
 #define CHELSIO_VPD_UNIQUE_ID	0x82
 
 /*
  * Small utility function to wait till any outstanding VPD Access is complete.
  * We have a per-adapter state variable "VPD Busy" to indicate when we have a
  * VPD Access in flight.  This allows us to handle the problem of having a
  * previous VPD Access time out and prevent an attempt to inject a new VPD
  * Request before any in-flight VPD reguest has completed.
  */
 static int t4_seeprom_wait(struct adapter *adapter)
 {
 	unsigned int base = adapter->params.pci.vpd_cap_addr;
 	int max_poll;
 
 	/*
 	 * If no VPD Access is in flight, we can just return success right
 	 * away.
 	 */
 	if (!adapter->vpd_busy)
 		return 0;
 
 	/*
 	 * Poll the VPD Capability Address/Flag register waiting for it
 	 * to indicate that the operation is complete.
 	 */
 	max_poll = EEPROM_MAX_POLL;
 	do {
 		u16 val;
 
 		udelay(EEPROM_DELAY);
 		t4_os_pci_read_cfg2(adapter, base + PCI_VPD_ADDR, &val);
 
 		/*
 		 * If the operation is complete, mark the VPD as no longer
 		 * busy and return success.
 		 */
 		if ((val & PCI_VPD_ADDR_F) == adapter->vpd_flag) {
 			adapter->vpd_busy = 0;
 			return 0;
 		}
 	} while (--max_poll);
 
 	/*
 	 * Failure!  Note that we leave the VPD Busy status set in order to
 	 * avoid pushing a new VPD Access request into the VPD Capability till
 	 * the current operation eventually succeeds.  It's a bug to issue a
 	 * new request when an existing request is in flight and will result
 	 * in corrupt hardware state.
 	 */
 	return -ETIMEDOUT;
 }
 
 /**
  *	t4_seeprom_read - read a serial EEPROM location
  *	@adapter: adapter to read
  *	@addr: EEPROM virtual address
  *	@data: where to store the read data
  *
  *	Read a 32-bit word from a location in serial EEPROM using the card's PCI
  *	VPD capability.  Note that this function must be called with a virtual
  *	address.
  */
 int t4_seeprom_read(struct adapter *adapter, u32 addr, u32 *data)
 {
 	unsigned int base = adapter->params.pci.vpd_cap_addr;
 	int ret;
 
 	/*
 	 * VPD Accesses must alway be 4-byte aligned!
 	 */
 	if (addr >= EEPROMVSIZE || (addr & 3))
 		return -EINVAL;
 
 	/*
 	 * Wait for any previous operation which may still be in flight to
 	 * complete.
 	 */
 	ret = t4_seeprom_wait(adapter);
 	if (ret) {
 		CH_ERR(adapter, "VPD still busy from previous operation\n");
 		return ret;
 	}
 
 	/*
 	 * Issue our new VPD Read request, mark the VPD as being busy and wait
 	 * for our request to complete.  If it doesn't complete, note the
 	 * error and return it to our caller.  Note that we do not reset the
 	 * VPD Busy status!
 	 */
 	t4_os_pci_write_cfg2(adapter, base + PCI_VPD_ADDR, (u16)addr);
 	adapter->vpd_busy = 1;
 	adapter->vpd_flag = PCI_VPD_ADDR_F;
 	ret = t4_seeprom_wait(adapter);
 	if (ret) {
 		CH_ERR(adapter, "VPD read of address %#x failed\n", addr);
 		return ret;
 	}
 
 	/*
 	 * Grab the returned data, swizzle it into our endianness and
 	 * return success.
 	 */
 	t4_os_pci_read_cfg4(adapter, base + PCI_VPD_DATA, data);
 	*data = le32_to_cpu(*data);
 	return 0;
 }
 
 /**
  *	t4_seeprom_write - write a serial EEPROM location
  *	@adapter: adapter to write
  *	@addr: virtual EEPROM address
  *	@data: value to write
  *
  *	Write a 32-bit word to a location in serial EEPROM using the card's PCI
  *	VPD capability.  Note that this function must be called with a virtual
  *	address.
  */
 int t4_seeprom_write(struct adapter *adapter, u32 addr, u32 data)
 {
 	unsigned int base = adapter->params.pci.vpd_cap_addr;
 	int ret;
 	u32 stats_reg;
 	int max_poll;
 
 	/*
 	 * VPD Accesses must alway be 4-byte aligned!
 	 */
 	if (addr >= EEPROMVSIZE || (addr & 3))
 		return -EINVAL;
 
 	/*
 	 * Wait for any previous operation which may still be in flight to
 	 * complete.
 	 */
 	ret = t4_seeprom_wait(adapter);
 	if (ret) {
 		CH_ERR(adapter, "VPD still busy from previous operation\n");
 		return ret;
 	}
 
 	/*
 	 * Issue our new VPD Read request, mark the VPD as being busy and wait
 	 * for our request to complete.  If it doesn't complete, note the
 	 * error and return it to our caller.  Note that we do not reset the
 	 * VPD Busy status!
 	 */
 	t4_os_pci_write_cfg4(adapter, base + PCI_VPD_DATA,
 				 cpu_to_le32(data));
 	t4_os_pci_write_cfg2(adapter, base + PCI_VPD_ADDR,
 				 (u16)addr | PCI_VPD_ADDR_F);
 	adapter->vpd_busy = 1;
 	adapter->vpd_flag = 0;
 	ret = t4_seeprom_wait(adapter);
 	if (ret) {
 		CH_ERR(adapter, "VPD write of address %#x failed\n", addr);
 		return ret;
 	}
 
 	/*
 	 * Reset PCI_VPD_DATA register after a transaction and wait for our
 	 * request to complete. If it doesn't complete, return error.
 	 */
 	t4_os_pci_write_cfg4(adapter, base + PCI_VPD_DATA, 0);
 	max_poll = EEPROM_MAX_POLL;
 	do {
 		udelay(EEPROM_DELAY);
 		t4_seeprom_read(adapter, EEPROM_STAT_ADDR, &stats_reg);
 	} while ((stats_reg & 0x1) && --max_poll);
 	if (!max_poll)
 		return -ETIMEDOUT;
 
 	/* Return success! */
 	return 0;
 }
 
 /**
  *	t4_eeprom_ptov - translate a physical EEPROM address to virtual
  *	@phys_addr: the physical EEPROM address
  *	@fn: the PCI function number
  *	@sz: size of function-specific area
  *
  *	Translate a physical EEPROM address to virtual.  The first 1K is
  *	accessed through virtual addresses starting at 31K, the rest is
  *	accessed through virtual addresses starting at 0.
  *
  *	The mapping is as follows:
  *	[0..1K) -> [31K..32K)
  *	[1K..1K+A) -> [ES-A..ES)
  *	[1K+A..ES) -> [0..ES-A-1K)
  *
  *	where A = @fn * @sz, and ES = EEPROM size.
  */
 int t4_eeprom_ptov(unsigned int phys_addr, unsigned int fn, unsigned int sz)
 {
 	fn *= sz;
 	if (phys_addr < 1024)
 		return phys_addr + (31 << 10);
 	if (phys_addr < 1024 + fn)
 		return EEPROMSIZE - fn + phys_addr - 1024;
 	if (phys_addr < EEPROMSIZE)
 		return phys_addr - 1024 - fn;
 	return -EINVAL;
 }
 
 /**
  *	t4_seeprom_wp - enable/disable EEPROM write protection
  *	@adapter: the adapter
  *	@enable: whether to enable or disable write protection
  *
  *	Enables or disables write protection on the serial EEPROM.
  */
 int t4_seeprom_wp(struct adapter *adapter, int enable)
 {
 	return t4_seeprom_write(adapter, EEPROM_STAT_ADDR, enable ? 0xc : 0);
 }
 
 /**
  *	get_vpd_keyword_val - Locates an information field keyword in the VPD
  *	@vpd: Pointer to buffered vpd data structure
  *	@kw: The keyword to search for
  *	@region: VPD region to search (starting from 0)
  *
  *	Returns the value of the information field keyword or
  *	-ENOENT otherwise.
  */
 static int get_vpd_keyword_val(const u8 *vpd, const char *kw, int region)
 {
 	int i, tag;
 	unsigned int offset, len;
 	const struct t4_vpdr_hdr *vpdr;
 
 	offset = sizeof(struct t4_vpd_hdr);
 	vpdr = (const void *)(vpd + offset);
 	tag = vpdr->vpdr_tag;
 	len = (u16)vpdr->vpdr_len[0] + ((u16)vpdr->vpdr_len[1] << 8);
 	while (region--) {
 		offset += sizeof(struct t4_vpdr_hdr) + len;
 		vpdr = (const void *)(vpd + offset);
 		if (++tag != vpdr->vpdr_tag)
 			return -ENOENT;
 		len = (u16)vpdr->vpdr_len[0] + ((u16)vpdr->vpdr_len[1] << 8);
 	}
 	offset += sizeof(struct t4_vpdr_hdr);
 
 	if (offset + len > VPD_LEN) {
 		return -ENOENT;
 	}
 
 	for (i = offset; i + VPD_INFO_FLD_HDR_SIZE <= offset + len;) {
 		if (memcmp(vpd + i , kw , 2) == 0){
 			i += VPD_INFO_FLD_HDR_SIZE;
 			return i;
 		}
 
 		i += VPD_INFO_FLD_HDR_SIZE + vpd[i+2];
 	}
 
 	return -ENOENT;
 }
 
 
 /**
  *	get_vpd_params - read VPD parameters from VPD EEPROM
  *	@adapter: adapter to read
  *	@p: where to store the parameters
  *	@vpd: caller provided temporary space to read the VPD into
  *
  *	Reads card parameters stored in VPD EEPROM.
  */
 static int get_vpd_params(struct adapter *adapter, struct vpd_params *p,
     uint16_t device_id, u32 *buf)
 {
 	int i, ret, addr;
 	int ec, sn, pn, na, md;
 	u8 csum;
 	const u8 *vpd = (const u8 *)buf;
 
 	/*
 	 * Card information normally starts at VPD_BASE but early cards had
 	 * it at 0.
 	 */
 	ret = t4_seeprom_read(adapter, VPD_BASE, buf);
 	if (ret)
 		return (ret);
 
 	/*
 	 * The VPD shall have a unique identifier specified by the PCI SIG.
 	 * For chelsio adapters, the identifier is 0x82. The first byte of a VPD
 	 * shall be CHELSIO_VPD_UNIQUE_ID (0x82). The VPD programming software
 	 * is expected to automatically put this entry at the
 	 * beginning of the VPD.
 	 */
 	addr = *vpd == CHELSIO_VPD_UNIQUE_ID ? VPD_BASE : VPD_BASE_OLD;
 
 	for (i = 0; i < VPD_LEN; i += 4) {
 		ret = t4_seeprom_read(adapter, addr + i, buf++);
 		if (ret)
 			return ret;
 	}
 
 #define FIND_VPD_KW(var,name) do { \
 	var = get_vpd_keyword_val(vpd, name, 0); \
 	if (var < 0) { \
 		CH_ERR(adapter, "missing VPD keyword " name "\n"); \
 		return -EINVAL; \
 	} \
 } while (0)
 
 	FIND_VPD_KW(i, "RV");
 	for (csum = 0; i >= 0; i--)
 		csum += vpd[i];
 
 	if (csum) {
 		CH_ERR(adapter,
 			"corrupted VPD EEPROM, actual csum %u\n", csum);
 		return -EINVAL;
 	}
 
 	FIND_VPD_KW(ec, "EC");
 	FIND_VPD_KW(sn, "SN");
 	FIND_VPD_KW(pn, "PN");
 	FIND_VPD_KW(na, "NA");
 #undef FIND_VPD_KW
 
 	memcpy(p->id, vpd + offsetof(struct t4_vpd_hdr, id_data), ID_LEN);
 	strstrip(p->id);
 	memcpy(p->ec, vpd + ec, EC_LEN);
 	strstrip(p->ec);
 	i = vpd[sn - VPD_INFO_FLD_HDR_SIZE + 2];
 	memcpy(p->sn, vpd + sn, min(i, SERNUM_LEN));
 	strstrip(p->sn);
 	i = vpd[pn - VPD_INFO_FLD_HDR_SIZE + 2];
 	memcpy(p->pn, vpd + pn, min(i, PN_LEN));
 	strstrip((char *)p->pn);
 	i = vpd[na - VPD_INFO_FLD_HDR_SIZE + 2];
 	memcpy(p->na, vpd + na, min(i, MACADDR_LEN));
 	strstrip((char *)p->na);
 
 	if (device_id & 0x80)
 		return 0;	/* Custom card */
 
 	md = get_vpd_keyword_val(vpd, "VF", 1);
 	if (md < 0) {
 		snprintf(p->md, sizeof(p->md), "unknown");
 	} else {
 		i = vpd[md - VPD_INFO_FLD_HDR_SIZE + 2];
 		memcpy(p->md, vpd + md, min(i, MD_LEN));
 		strstrip((char *)p->md);
 	}
 
 	return 0;
 }
 
 /* serial flash and firmware constants and flash config file constants */
 enum {
 	SF_ATTEMPTS = 10,	/* max retries for SF operations */
 
 	/* flash command opcodes */
 	SF_PROG_PAGE    = 2,	/* program 256B page */
 	SF_WR_DISABLE   = 4,	/* disable writes */
 	SF_RD_STATUS    = 5,	/* read status register */
 	SF_WR_ENABLE    = 6,	/* enable writes */
 	SF_RD_DATA_FAST = 0xb,	/* read flash */
 	SF_RD_ID	= 0x9f,	/* read ID */
 	SF_ERASE_SECTOR = 0xd8,	/* erase 64KB sector */
 };
 
 /**
  *	sf1_read - read data from the serial flash
  *	@adapter: the adapter
  *	@byte_cnt: number of bytes to read
  *	@cont: whether another operation will be chained
  *	@lock: whether to lock SF for PL access only
  *	@valp: where to store the read data
  *
  *	Reads up to 4 bytes of data from the serial flash.  The location of
  *	the read needs to be specified prior to calling this by issuing the
  *	appropriate commands to the serial flash.
  */
 static int sf1_read(struct adapter *adapter, unsigned int byte_cnt, int cont,
 		    int lock, u32 *valp)
 {
 	int ret;
 
 	if (!byte_cnt || byte_cnt > 4)
 		return -EINVAL;
 	if (t4_read_reg(adapter, A_SF_OP) & F_BUSY)
 		return -EBUSY;
 	t4_write_reg(adapter, A_SF_OP,
 		     V_SF_LOCK(lock) | V_CONT(cont) | V_BYTECNT(byte_cnt - 1));
 	ret = t4_wait_op_done(adapter, A_SF_OP, F_BUSY, 0, SF_ATTEMPTS, 5);
 	if (!ret)
 		*valp = t4_read_reg(adapter, A_SF_DATA);
 	return ret;
 }
 
 /**
  *	sf1_write - write data to the serial flash
  *	@adapter: the adapter
  *	@byte_cnt: number of bytes to write
  *	@cont: whether another operation will be chained
  *	@lock: whether to lock SF for PL access only
  *	@val: value to write
  *
  *	Writes up to 4 bytes of data to the serial flash.  The location of
  *	the write needs to be specified prior to calling this by issuing the
  *	appropriate commands to the serial flash.
  */
 static int sf1_write(struct adapter *adapter, unsigned int byte_cnt, int cont,
 		     int lock, u32 val)
 {
 	if (!byte_cnt || byte_cnt > 4)
 		return -EINVAL;
 	if (t4_read_reg(adapter, A_SF_OP) & F_BUSY)
 		return -EBUSY;
 	t4_write_reg(adapter, A_SF_DATA, val);
 	t4_write_reg(adapter, A_SF_OP, V_SF_LOCK(lock) |
 		     V_CONT(cont) | V_BYTECNT(byte_cnt - 1) | V_OP(1));
 	return t4_wait_op_done(adapter, A_SF_OP, F_BUSY, 0, SF_ATTEMPTS, 5);
 }
 
 /**
  *	flash_wait_op - wait for a flash operation to complete
  *	@adapter: the adapter
  *	@attempts: max number of polls of the status register
  *	@delay: delay between polls in ms
  *
  *	Wait for a flash operation to complete by polling the status register.
  */
 static int flash_wait_op(struct adapter *adapter, int attempts, int delay)
 {
 	int ret;
 	u32 status;
 
 	while (1) {
 		if ((ret = sf1_write(adapter, 1, 1, 1, SF_RD_STATUS)) != 0 ||
 		    (ret = sf1_read(adapter, 1, 0, 1, &status)) != 0)
 			return ret;
 		if (!(status & 1))
 			return 0;
 		if (--attempts == 0)
 			return -EAGAIN;
 		if (delay)
 			msleep(delay);
 	}
 }
 
 /**
  *	t4_read_flash - read words from serial flash
  *	@adapter: the adapter
  *	@addr: the start address for the read
  *	@nwords: how many 32-bit words to read
  *	@data: where to store the read data
  *	@byte_oriented: whether to store data as bytes or as words
  *
  *	Read the specified number of 32-bit words from the serial flash.
  *	If @byte_oriented is set the read data is stored as a byte array
  *	(i.e., big-endian), otherwise as 32-bit words in the platform's
  *	natural endianness.
  */
 int t4_read_flash(struct adapter *adapter, unsigned int addr,
 		  unsigned int nwords, u32 *data, int byte_oriented)
 {
 	int ret;
 
 	if (addr + nwords * sizeof(u32) > adapter->params.sf_size || (addr & 3))
 		return -EINVAL;
 
 	addr = swab32(addr) | SF_RD_DATA_FAST;
 
 	if ((ret = sf1_write(adapter, 4, 1, 0, addr)) != 0 ||
 	    (ret = sf1_read(adapter, 1, 1, 0, data)) != 0)
 		return ret;
 
 	for ( ; nwords; nwords--, data++) {
 		ret = sf1_read(adapter, 4, nwords > 1, nwords == 1, data);
 		if (nwords == 1)
 			t4_write_reg(adapter, A_SF_OP, 0);    /* unlock SF */
 		if (ret)
 			return ret;
 		if (byte_oriented)
 			*data = (__force __u32)(cpu_to_be32(*data));
 	}
 	return 0;
 }
 
 /**
  *	t4_write_flash - write up to a page of data to the serial flash
  *	@adapter: the adapter
  *	@addr: the start address to write
  *	@n: length of data to write in bytes
  *	@data: the data to write
  *	@byte_oriented: whether to store data as bytes or as words
  *
  *	Writes up to a page of data (256 bytes) to the serial flash starting
  *	at the given address.  All the data must be written to the same page.
  *	If @byte_oriented is set the write data is stored as byte stream
  *	(i.e. matches what on disk), otherwise in big-endian.
  */
 int t4_write_flash(struct adapter *adapter, unsigned int addr,
 			  unsigned int n, const u8 *data, int byte_oriented)
 {
 	int ret;
 	u32 buf[SF_PAGE_SIZE / 4];
 	unsigned int i, c, left, val, offset = addr & 0xff;
 
 	if (addr >= adapter->params.sf_size || offset + n > SF_PAGE_SIZE)
 		return -EINVAL;
 
 	val = swab32(addr) | SF_PROG_PAGE;
 
 	if ((ret = sf1_write(adapter, 1, 0, 1, SF_WR_ENABLE)) != 0 ||
 	    (ret = sf1_write(adapter, 4, 1, 1, val)) != 0)
 		goto unlock;
 
 	for (left = n; left; left -= c) {
 		c = min(left, 4U);
 		for (val = 0, i = 0; i < c; ++i)
 			val = (val << 8) + *data++;
 
 		if (!byte_oriented)
 			val = cpu_to_be32(val);
 
 		ret = sf1_write(adapter, c, c != left, 1, val);
 		if (ret)
 			goto unlock;
 	}
 	ret = flash_wait_op(adapter, 8, 1);
 	if (ret)
 		goto unlock;
 
 	t4_write_reg(adapter, A_SF_OP, 0);    /* unlock SF */
 
 	/* Read the page to verify the write succeeded */
 	ret = t4_read_flash(adapter, addr & ~0xff, ARRAY_SIZE(buf), buf,
 			    byte_oriented);
 	if (ret)
 		return ret;
 
 	if (memcmp(data - n, (u8 *)buf + offset, n)) {
 		CH_ERR(adapter,
 			"failed to correctly write the flash page at %#x\n",
 			addr);
 		return -EIO;
 	}
 	return 0;
 
 unlock:
 	t4_write_reg(adapter, A_SF_OP, 0);    /* unlock SF */
 	return ret;
 }
 
 /**
  *	t4_get_fw_version - read the firmware version
  *	@adapter: the adapter
  *	@vers: where to place the version
  *
  *	Reads the FW version from flash.
  */
 int t4_get_fw_version(struct adapter *adapter, u32 *vers)
 {
 	return t4_read_flash(adapter, FLASH_FW_START +
 			     offsetof(struct fw_hdr, fw_ver), 1,
 			     vers, 0);
 }
 
 /**
  *	t4_get_fw_hdr - read the firmware header
  *	@adapter: the adapter
  *	@hdr: where to place the version
  *
  *	Reads the FW header from flash into caller provided buffer.
  */
 int t4_get_fw_hdr(struct adapter *adapter, struct fw_hdr *hdr)
 {
 	return t4_read_flash(adapter, FLASH_FW_START,
 	    sizeof (*hdr) / sizeof (uint32_t), (uint32_t *)hdr, 1);
 }
 
 /**
  *	t4_get_bs_version - read the firmware bootstrap version
  *	@adapter: the adapter
  *	@vers: where to place the version
  *
  *	Reads the FW Bootstrap version from flash.
  */
 int t4_get_bs_version(struct adapter *adapter, u32 *vers)
 {
 	return t4_read_flash(adapter, FLASH_FWBOOTSTRAP_START +
 			     offsetof(struct fw_hdr, fw_ver), 1,
 			     vers, 0);
 }
 
 /**
  *	t4_get_tp_version - read the TP microcode version
  *	@adapter: the adapter
  *	@vers: where to place the version
  *
  *	Reads the TP microcode version from flash.
  */
 int t4_get_tp_version(struct adapter *adapter, u32 *vers)
 {
 	return t4_read_flash(adapter, FLASH_FW_START +
 			     offsetof(struct fw_hdr, tp_microcode_ver),
 			     1, vers, 0);
 }
 
 /**
  *	t4_get_exprom_version - return the Expansion ROM version (if any)
  *	@adapter: the adapter
  *	@vers: where to place the version
  *
  *	Reads the Expansion ROM header from FLASH and returns the version
  *	number (if present) through the @vers return value pointer.  We return
  *	this in the Firmware Version Format since it's convenient.  Return
  *	0 on success, -ENOENT if no Expansion ROM is present.
  */
 int t4_get_exprom_version(struct adapter *adap, u32 *vers)
 {
 	struct exprom_header {
 		unsigned char hdr_arr[16];	/* must start with 0x55aa */
 		unsigned char hdr_ver[4];	/* Expansion ROM version */
 	} *hdr;
 	u32 exprom_header_buf[DIV_ROUND_UP(sizeof(struct exprom_header),
 					   sizeof(u32))];
 	int ret;
 
 	ret = t4_read_flash(adap, FLASH_EXP_ROM_START,
 			    ARRAY_SIZE(exprom_header_buf), exprom_header_buf,
 			    0);
 	if (ret)
 		return ret;
 
 	hdr = (struct exprom_header *)exprom_header_buf;
 	if (hdr->hdr_arr[0] != 0x55 || hdr->hdr_arr[1] != 0xaa)
 		return -ENOENT;
 
 	*vers = (V_FW_HDR_FW_VER_MAJOR(hdr->hdr_ver[0]) |
 		 V_FW_HDR_FW_VER_MINOR(hdr->hdr_ver[1]) |
 		 V_FW_HDR_FW_VER_MICRO(hdr->hdr_ver[2]) |
 		 V_FW_HDR_FW_VER_BUILD(hdr->hdr_ver[3]));
 	return 0;
 }
 
 /**
  *	t4_get_scfg_version - return the Serial Configuration version
  *	@adapter: the adapter
  *	@vers: where to place the version
  *
  *	Reads the Serial Configuration Version via the Firmware interface
  *	(thus this can only be called once we're ready to issue Firmware
  *	commands).  The format of the Serial Configuration version is
  *	adapter specific.  Returns 0 on success, an error on failure.
  *
  *	Note that early versions of the Firmware didn't include the ability
  *	to retrieve the Serial Configuration version, so we zero-out the
  *	return-value parameter in that case to avoid leaving it with
  *	garbage in it.
  *
  *	Also note that the Firmware will return its cached copy of the Serial
  *	Initialization Revision ID, not the actual Revision ID as written in
  *	the Serial EEPROM.  This is only an issue if a new VPD has been written
  *	and the Firmware/Chip haven't yet gone through a RESET sequence.  So
  *	it's best to defer calling this routine till after a FW_RESET_CMD has
  *	been issued if the Host Driver will be performing a full adapter
  *	initialization.
  */
 int t4_get_scfg_version(struct adapter *adapter, u32 *vers)
 {
 	u32 scfgrev_param;
 	int ret;
 
 	scfgrev_param = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
 			 V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_SCFGREV));
 	ret = t4_query_params(adapter, adapter->mbox, adapter->pf, 0,
 			      1, &scfgrev_param, vers);
 	if (ret)
 		*vers = 0;
 	return ret;
 }
 
 /**
  *	t4_get_vpd_version - return the VPD version
  *	@adapter: the adapter
  *	@vers: where to place the version
  *
  *	Reads the VPD via the Firmware interface (thus this can only be called
  *	once we're ready to issue Firmware commands).  The format of the
  *	VPD version is adapter specific.  Returns 0 on success, an error on
  *	failure.
  *
  *	Note that early versions of the Firmware didn't include the ability
  *	to retrieve the VPD version, so we zero-out the return-value parameter
  *	in that case to avoid leaving it with garbage in it.
  *
  *	Also note that the Firmware will return its cached copy of the VPD
  *	Revision ID, not the actual Revision ID as written in the Serial
  *	EEPROM.  This is only an issue if a new VPD has been written and the
  *	Firmware/Chip haven't yet gone through a RESET sequence.  So it's best
  *	to defer calling this routine till after a FW_RESET_CMD has been issued
  *	if the Host Driver will be performing a full adapter initialization.
  */
 int t4_get_vpd_version(struct adapter *adapter, u32 *vers)
 {
 	u32 vpdrev_param;
 	int ret;
 
 	vpdrev_param = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
 			V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_VPDREV));
 	ret = t4_query_params(adapter, adapter->mbox, adapter->pf, 0,
 			      1, &vpdrev_param, vers);
 	if (ret)
 		*vers = 0;
 	return ret;
 }
 
 /**
  *	t4_get_version_info - extract various chip/firmware version information
  *	@adapter: the adapter
  *
  *	Reads various chip/firmware version numbers and stores them into the
  *	adapter Adapter Parameters structure.  If any of the efforts fails
  *	the first failure will be returned, but all of the version numbers
  *	will be read.
  */
 int t4_get_version_info(struct adapter *adapter)
 {
 	int ret = 0;
 
 	#define FIRST_RET(__getvinfo) \
 	do { \
 		int __ret = __getvinfo; \
 		if (__ret && !ret) \
 			ret = __ret; \
 	} while (0)
 
 	FIRST_RET(t4_get_fw_version(adapter, &adapter->params.fw_vers));
 	FIRST_RET(t4_get_bs_version(adapter, &adapter->params.bs_vers));
 	FIRST_RET(t4_get_tp_version(adapter, &adapter->params.tp_vers));
 	FIRST_RET(t4_get_exprom_version(adapter, &adapter->params.er_vers));
 	FIRST_RET(t4_get_scfg_version(adapter, &adapter->params.scfg_vers));
 	FIRST_RET(t4_get_vpd_version(adapter, &adapter->params.vpd_vers));
 
 	#undef FIRST_RET
 
 	return ret;
 }
 
 /**
  *	t4_flash_erase_sectors - erase a range of flash sectors
  *	@adapter: the adapter
  *	@start: the first sector to erase
  *	@end: the last sector to erase
  *
  *	Erases the sectors in the given inclusive range.
  */
 int t4_flash_erase_sectors(struct adapter *adapter, int start, int end)
 {
 	int ret = 0;
 
 	if (end >= adapter->params.sf_nsec)
 		return -EINVAL;
 
 	while (start <= end) {
 		if ((ret = sf1_write(adapter, 1, 0, 1, SF_WR_ENABLE)) != 0 ||
 		    (ret = sf1_write(adapter, 4, 0, 1,
 				     SF_ERASE_SECTOR | (start << 8))) != 0 ||
 		    (ret = flash_wait_op(adapter, 14, 500)) != 0) {
 			CH_ERR(adapter,
 				"erase of flash sector %d failed, error %d\n",
 				start, ret);
 			break;
 		}
 		start++;
 	}
 	t4_write_reg(adapter, A_SF_OP, 0);    /* unlock SF */
 	return ret;
 }
 
 /**
  *	t4_flash_cfg_addr - return the address of the flash configuration file
  *	@adapter: the adapter
  *
  *	Return the address within the flash where the Firmware Configuration
  *	File is stored, or an error if the device FLASH is too small to contain
  *	a Firmware Configuration File.
  */
 int t4_flash_cfg_addr(struct adapter *adapter)
 {
 	/*
 	 * If the device FLASH isn't large enough to hold a Firmware
 	 * Configuration File, return an error.
 	 */
 	if (adapter->params.sf_size < FLASH_CFG_START + FLASH_CFG_MAX_SIZE)
 		return -ENOSPC;
 
 	return FLASH_CFG_START;
 }
 
 /*
  * Return TRUE if the specified firmware matches the adapter.  I.e. T4
  * firmware for T4 adapters, T5 firmware for T5 adapters, etc.  We go ahead
  * and emit an error message for mismatched firmware to save our caller the
  * effort ...
  */
 static int t4_fw_matches_chip(struct adapter *adap,
 			      const struct fw_hdr *hdr)
 {
 	/*
 	 * The expression below will return FALSE for any unsupported adapter
 	 * which will keep us "honest" in the future ...
 	 */
 	if ((is_t4(adap) && hdr->chip == FW_HDR_CHIP_T4) ||
 	    (is_t5(adap) && hdr->chip == FW_HDR_CHIP_T5) ||
 	    (is_t6(adap) && hdr->chip == FW_HDR_CHIP_T6))
 		return 1;
 
 	CH_ERR(adap,
 		"FW image (%d) is not suitable for this adapter (%d)\n",
 		hdr->chip, chip_id(adap));
 	return 0;
 }
 
 /**
  *	t4_load_fw - download firmware
  *	@adap: the adapter
  *	@fw_data: the firmware image to write
  *	@size: image size
  *
  *	Write the supplied firmware image to the card's serial flash.
  */
 int t4_load_fw(struct adapter *adap, const u8 *fw_data, unsigned int size)
 {
 	u32 csum;
 	int ret, addr;
 	unsigned int i;
 	u8 first_page[SF_PAGE_SIZE];
 	const u32 *p = (const u32 *)fw_data;
 	const struct fw_hdr *hdr = (const struct fw_hdr *)fw_data;
 	unsigned int sf_sec_size = adap->params.sf_size / adap->params.sf_nsec;
 	unsigned int fw_start_sec;
 	unsigned int fw_start;
 	unsigned int fw_size;
 
 	if (ntohl(hdr->magic) == FW_HDR_MAGIC_BOOTSTRAP) {
 		fw_start_sec = FLASH_FWBOOTSTRAP_START_SEC;
 		fw_start = FLASH_FWBOOTSTRAP_START;
 		fw_size = FLASH_FWBOOTSTRAP_MAX_SIZE;
 	} else {
 		fw_start_sec = FLASH_FW_START_SEC;
  		fw_start = FLASH_FW_START;
 		fw_size = FLASH_FW_MAX_SIZE;
 	}
 
 	if (!size) {
 		CH_ERR(adap, "FW image has no data\n");
 		return -EINVAL;
 	}
 	if (size & 511) {
 		CH_ERR(adap,
 			"FW image size not multiple of 512 bytes\n");
 		return -EINVAL;
 	}
 	if ((unsigned int) be16_to_cpu(hdr->len512) * 512 != size) {
 		CH_ERR(adap,
 			"FW image size differs from size in FW header\n");
 		return -EINVAL;
 	}
 	if (size > fw_size) {
 		CH_ERR(adap, "FW image too large, max is %u bytes\n",
 			fw_size);
 		return -EFBIG;
 	}
 	if (!t4_fw_matches_chip(adap, hdr))
 		return -EINVAL;
 
 	for (csum = 0, i = 0; i < size / sizeof(csum); i++)
 		csum += be32_to_cpu(p[i]);
 
 	if (csum != 0xffffffff) {
 		CH_ERR(adap,
 			"corrupted firmware image, checksum %#x\n", csum);
 		return -EINVAL;
 	}
 
 	i = DIV_ROUND_UP(size, sf_sec_size);	/* # of sectors spanned */
 	ret = t4_flash_erase_sectors(adap, fw_start_sec, fw_start_sec + i - 1);
 	if (ret)
 		goto out;
 
 	/*
 	 * We write the correct version at the end so the driver can see a bad
 	 * version if the FW write fails.  Start by writing a copy of the
 	 * first page with a bad version.
 	 */
 	memcpy(first_page, fw_data, SF_PAGE_SIZE);
 	((struct fw_hdr *)first_page)->fw_ver = cpu_to_be32(0xffffffff);
 	ret = t4_write_flash(adap, fw_start, SF_PAGE_SIZE, first_page, 1);
 	if (ret)
 		goto out;
 
 	addr = fw_start;
 	for (size -= SF_PAGE_SIZE; size; size -= SF_PAGE_SIZE) {
 		addr += SF_PAGE_SIZE;
 		fw_data += SF_PAGE_SIZE;
 		ret = t4_write_flash(adap, addr, SF_PAGE_SIZE, fw_data, 1);
 		if (ret)
 			goto out;
 	}
 
 	ret = t4_write_flash(adap,
 			     fw_start + offsetof(struct fw_hdr, fw_ver),
 			     sizeof(hdr->fw_ver), (const u8 *)&hdr->fw_ver, 1);
 out:
 	if (ret)
 		CH_ERR(adap, "firmware download failed, error %d\n",
 			ret);
 	return ret;
 }
 
 /**
  *	t4_fwcache - firmware cache operation
  *	@adap: the adapter
  *	@op  : the operation (flush or flush and invalidate)
  */
 int t4_fwcache(struct adapter *adap, enum fw_params_param_dev_fwcache op)
 {
 	struct fw_params_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn =
 	    cpu_to_be32(V_FW_CMD_OP(FW_PARAMS_CMD) |
 			    F_FW_CMD_REQUEST | F_FW_CMD_WRITE |
 				V_FW_PARAMS_CMD_PFN(adap->pf) |
 				V_FW_PARAMS_CMD_VFN(0));
 	c.retval_len16 = cpu_to_be32(FW_LEN16(c));
 	c.param[0].mnem =
 	    cpu_to_be32(V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
 			    V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_FWCACHE));
 	c.param[0].val = (__force __be32)op;
 
 	return t4_wr_mbox(adap, adap->mbox, &c, sizeof(c), NULL);
 }
 
 void t4_cim_read_pif_la(struct adapter *adap, u32 *pif_req, u32 *pif_rsp,
 			unsigned int *pif_req_wrptr,
 			unsigned int *pif_rsp_wrptr)
 {
 	int i, j;
 	u32 cfg, val, req, rsp;
 
 	cfg = t4_read_reg(adap, A_CIM_DEBUGCFG);
 	if (cfg & F_LADBGEN)
 		t4_write_reg(adap, A_CIM_DEBUGCFG, cfg ^ F_LADBGEN);
 
 	val = t4_read_reg(adap, A_CIM_DEBUGSTS);
 	req = G_POLADBGWRPTR(val);
 	rsp = G_PILADBGWRPTR(val);
 	if (pif_req_wrptr)
 		*pif_req_wrptr = req;
 	if (pif_rsp_wrptr)
 		*pif_rsp_wrptr = rsp;
 
 	for (i = 0; i < CIM_PIFLA_SIZE; i++) {
 		for (j = 0; j < 6; j++) {
 			t4_write_reg(adap, A_CIM_DEBUGCFG, V_POLADBGRDPTR(req) |
 				     V_PILADBGRDPTR(rsp));
 			*pif_req++ = t4_read_reg(adap, A_CIM_PO_LA_DEBUGDATA);
 			*pif_rsp++ = t4_read_reg(adap, A_CIM_PI_LA_DEBUGDATA);
 			req++;
 			rsp++;
 		}
 		req = (req + 2) & M_POLADBGRDPTR;
 		rsp = (rsp + 2) & M_PILADBGRDPTR;
 	}
 	t4_write_reg(adap, A_CIM_DEBUGCFG, cfg);
 }
 
 void t4_cim_read_ma_la(struct adapter *adap, u32 *ma_req, u32 *ma_rsp)
 {
 	u32 cfg;
 	int i, j, idx;
 
 	cfg = t4_read_reg(adap, A_CIM_DEBUGCFG);
 	if (cfg & F_LADBGEN)
 		t4_write_reg(adap, A_CIM_DEBUGCFG, cfg ^ F_LADBGEN);
 
 	for (i = 0; i < CIM_MALA_SIZE; i++) {
 		for (j = 0; j < 5; j++) {
 			idx = 8 * i + j;
 			t4_write_reg(adap, A_CIM_DEBUGCFG, V_POLADBGRDPTR(idx) |
 				     V_PILADBGRDPTR(idx));
 			*ma_req++ = t4_read_reg(adap, A_CIM_PO_LA_MADEBUGDATA);
 			*ma_rsp++ = t4_read_reg(adap, A_CIM_PI_LA_MADEBUGDATA);
 		}
 	}
 	t4_write_reg(adap, A_CIM_DEBUGCFG, cfg);
 }
 
 void t4_ulprx_read_la(struct adapter *adap, u32 *la_buf)
 {
 	unsigned int i, j;
 
 	for (i = 0; i < 8; i++) {
 		u32 *p = la_buf + i;
 
 		t4_write_reg(adap, A_ULP_RX_LA_CTL, i);
 		j = t4_read_reg(adap, A_ULP_RX_LA_WRPTR);
 		t4_write_reg(adap, A_ULP_RX_LA_RDPTR, j);
 		for (j = 0; j < ULPRX_LA_SIZE; j++, p += 8)
 			*p = t4_read_reg(adap, A_ULP_RX_LA_RDDATA);
 	}
 }
 
 /**
  *	fwcaps16_to_caps32 - convert 16-bit Port Capabilities to 32-bits
  *	@caps16: a 16-bit Port Capabilities value
  *
  *	Returns the equivalent 32-bit Port Capabilities value.
  */
 static uint32_t fwcaps16_to_caps32(uint16_t caps16)
 {
 	uint32_t caps32 = 0;
 
 	#define CAP16_TO_CAP32(__cap) \
 		do { \
 			if (caps16 & FW_PORT_CAP_##__cap) \
 				caps32 |= FW_PORT_CAP32_##__cap; \
 		} while (0)
 
 	CAP16_TO_CAP32(SPEED_100M);
 	CAP16_TO_CAP32(SPEED_1G);
 	CAP16_TO_CAP32(SPEED_25G);
 	CAP16_TO_CAP32(SPEED_10G);
 	CAP16_TO_CAP32(SPEED_40G);
 	CAP16_TO_CAP32(SPEED_100G);
 	CAP16_TO_CAP32(FC_RX);
 	CAP16_TO_CAP32(FC_TX);
 	CAP16_TO_CAP32(ANEG);
 	CAP16_TO_CAP32(FORCE_PAUSE);
 	CAP16_TO_CAP32(MDIAUTO);
 	CAP16_TO_CAP32(MDISTRAIGHT);
 	CAP16_TO_CAP32(FEC_RS);
 	CAP16_TO_CAP32(FEC_BASER_RS);
 	CAP16_TO_CAP32(802_3_PAUSE);
 	CAP16_TO_CAP32(802_3_ASM_DIR);
 
 	#undef CAP16_TO_CAP32
 
 	return caps32;
 }
 
 /**
  *	fwcaps32_to_caps16 - convert 32-bit Port Capabilities to 16-bits
  *	@caps32: a 32-bit Port Capabilities value
  *
  *	Returns the equivalent 16-bit Port Capabilities value.  Note that
  *	not all 32-bit Port Capabilities can be represented in the 16-bit
  *	Port Capabilities and some fields/values may not make it.
  */
 static uint16_t fwcaps32_to_caps16(uint32_t caps32)
 {
 	uint16_t caps16 = 0;
 
 	#define CAP32_TO_CAP16(__cap) \
 		do { \
 			if (caps32 & FW_PORT_CAP32_##__cap) \
 				caps16 |= FW_PORT_CAP_##__cap; \
 		} while (0)
 
 	CAP32_TO_CAP16(SPEED_100M);
 	CAP32_TO_CAP16(SPEED_1G);
 	CAP32_TO_CAP16(SPEED_10G);
 	CAP32_TO_CAP16(SPEED_25G);
 	CAP32_TO_CAP16(SPEED_40G);
 	CAP32_TO_CAP16(SPEED_100G);
 	CAP32_TO_CAP16(FC_RX);
 	CAP32_TO_CAP16(FC_TX);
 	CAP32_TO_CAP16(802_3_PAUSE);
 	CAP32_TO_CAP16(802_3_ASM_DIR);
 	CAP32_TO_CAP16(ANEG);
 	CAP32_TO_CAP16(FORCE_PAUSE);
 	CAP32_TO_CAP16(MDIAUTO);
 	CAP32_TO_CAP16(MDISTRAIGHT);
 	CAP32_TO_CAP16(FEC_RS);
 	CAP32_TO_CAP16(FEC_BASER_RS);
 
 	#undef CAP32_TO_CAP16
 
 	return caps16;
 }
 
 static bool
 is_bt(struct port_info *pi)
 {
 
 	return (pi->port_type == FW_PORT_TYPE_BT_SGMII ||
 	    pi->port_type == FW_PORT_TYPE_BT_XFI ||
 	    pi->port_type == FW_PORT_TYPE_BT_XAUI);
 }
 
 /**
  *	t4_link_l1cfg - apply link configuration to MAC/PHY
  *	@phy: the PHY to setup
  *	@mac: the MAC to setup
  *	@lc: the requested link configuration
  *
  *	Set up a port's MAC and PHY according to a desired link configuration.
  *	- If the PHY can auto-negotiate first decide what to advertise, then
  *	  enable/disable auto-negotiation as desired, and reset.
  *	- If the PHY does not auto-negotiate just reset it.
  *	- If auto-negotiation is off set the MAC to the proper speed/duplex/FC,
  *	  otherwise do it later based on the outcome of auto-negotiation.
  */
 int t4_link_l1cfg(struct adapter *adap, unsigned int mbox, unsigned int port,
 		  struct link_config *lc)
 {
 	struct fw_port_cmd c;
 	unsigned int mdi = V_FW_PORT_CAP32_MDI(FW_PORT_CAP32_MDI_AUTO);
 	unsigned int aneg, fc, fec, speed, rcap;
 
 	fc = 0;
 	if (lc->requested_fc & PAUSE_RX)
 		fc |= FW_PORT_CAP32_FC_RX;
 	if (lc->requested_fc & PAUSE_TX)
 		fc |= FW_PORT_CAP32_FC_TX;
 	if (!(lc->requested_fc & PAUSE_AUTONEG))
 		fc |= FW_PORT_CAP32_FORCE_PAUSE;
 
 	fec = 0;
 	if (lc->requested_fec == FEC_AUTO)
 		fec = lc->fec_hint;
 	else {
 		if (lc->requested_fec & FEC_RS)
 			fec |= FW_PORT_CAP32_FEC_RS;
 		if (lc->requested_fec & FEC_BASER_RS)
 			fec |= FW_PORT_CAP32_FEC_BASER_RS;
 	}
 
 	if (lc->requested_aneg == AUTONEG_DISABLE)
 		aneg = 0;
 	else if (lc->requested_aneg == AUTONEG_ENABLE)
 		aneg = FW_PORT_CAP32_ANEG;
 	else
 		aneg = lc->supported & FW_PORT_CAP32_ANEG;
 
 	if (aneg) {
 		speed = lc->supported & V_FW_PORT_CAP32_SPEED(M_FW_PORT_CAP32_SPEED);
 	} else if (lc->requested_speed != 0)
 		speed = speed_to_fwcap(lc->requested_speed);
 	else
 		speed = fwcap_top_speed(lc->supported);
 
 	/* Force AN on for BT cards. */
-	if (is_bt(adap->port[port]))
+	if (is_bt(adap->port[adap->chan_map[port]]))
 		aneg = lc->supported & FW_PORT_CAP32_ANEG;
 
 	rcap = aneg | speed | fc | fec;
 	if ((rcap | lc->supported) != lc->supported) {
 #ifdef INVARIANTS
 		CH_WARN(adap, "rcap 0x%08x, pcap 0x%08x\n", rcap,
 		    lc->supported);
 #endif
 		rcap &= lc->supported;
 	}
 	rcap |= mdi;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_portid = cpu_to_be32(V_FW_CMD_OP(FW_PORT_CMD) |
 				     F_FW_CMD_REQUEST | F_FW_CMD_EXEC |
 				     V_FW_PORT_CMD_PORTID(port));
 	if (adap->params.port_caps32) {
 		c.action_to_len16 =
 		    cpu_to_be32(V_FW_PORT_CMD_ACTION(FW_PORT_ACTION_L1_CFG32) |
 			FW_LEN16(c));
 		c.u.l1cfg32.rcap32 = cpu_to_be32(rcap);
 	} else {
 		c.action_to_len16 =
 		    cpu_to_be32(V_FW_PORT_CMD_ACTION(FW_PORT_ACTION_L1_CFG) |
 			    FW_LEN16(c));
 		c.u.l1cfg.rcap = cpu_to_be32(fwcaps32_to_caps16(rcap));
 	}
 
 	return t4_wr_mbox_ns(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_restart_aneg - restart autonegotiation
  *	@adap: the adapter
  *	@mbox: mbox to use for the FW command
  *	@port: the port id
  *
  *	Restarts autonegotiation for the selected port.
  */
 int t4_restart_aneg(struct adapter *adap, unsigned int mbox, unsigned int port)
 {
 	struct fw_port_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_portid = cpu_to_be32(V_FW_CMD_OP(FW_PORT_CMD) |
 				     F_FW_CMD_REQUEST | F_FW_CMD_EXEC |
 				     V_FW_PORT_CMD_PORTID(port));
 	c.action_to_len16 =
 		cpu_to_be32(V_FW_PORT_CMD_ACTION(FW_PORT_ACTION_L1_CFG) |
 			    FW_LEN16(c));
 	c.u.l1cfg.rcap = cpu_to_be32(FW_PORT_CAP_ANEG);
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 struct intr_details {
 	u32 mask;
 	const char *msg;
 };
 
 struct intr_action {
 	u32 mask;
 	int arg;
 	bool (*action)(struct adapter *, int, bool);
 };
 
 struct intr_info {
 	const char *name;	/* name of the INT_CAUSE register */
 	int cause_reg;		/* INT_CAUSE register */
 	int enable_reg;		/* INT_ENABLE register */
 	u32 fatal;		/* bits that are fatal */
 	const struct intr_details *details;
 	const struct intr_action *actions;
 };
 
 static inline char
 intr_alert_char(u32 cause, u32 enable, u32 fatal)
 {
 
 	if (cause & fatal)
 		return ('!');
 	if (cause & enable)
 		return ('*');
 	return ('-');
 }
 
 static void
 t4_show_intr_info(struct adapter *adap, const struct intr_info *ii, u32 cause)
 {
 	u32 enable, leftover;
 	const struct intr_details *details;
 	char alert;
 
 	enable = t4_read_reg(adap, ii->enable_reg);
 	alert = intr_alert_char(cause, enable, ii->fatal);
 	CH_ALERT(adap, "%c %s 0x%x = 0x%08x, E 0x%08x, F 0x%08x\n",
 	    alert, ii->name, ii->cause_reg, cause, enable, ii->fatal);
 
 	leftover = cause;
 	for (details = ii->details; details && details->mask != 0; details++) {
 		u32 msgbits = details->mask & cause;
 		if (msgbits == 0)
 			continue;
 		alert = intr_alert_char(msgbits, enable, ii->fatal);
 		CH_ALERT(adap, "  %c [0x%08x] %s\n", alert, msgbits,
 		    details->msg);
 		leftover &= ~msgbits;
 	}
 	if (leftover != 0 && leftover != cause)
 		CH_ALERT(adap, "  ? [0x%08x]\n", leftover);
 }
 
 /*
  * Returns true for fatal error.
  */
 static bool
 t4_handle_intr(struct adapter *adap, const struct intr_info *ii,
     u32 additional_cause, bool verbose)
 {
 	u32 cause;
 	bool fatal;
 	const struct intr_action *action;
 
 	/* read and display cause. */
 	cause = t4_read_reg(adap, ii->cause_reg);
 	if (verbose || cause != 0)
 		t4_show_intr_info(adap, ii, cause);
 	fatal = (cause & ii->fatal) != 0;
 	cause |= additional_cause;
 	if (cause == 0)
 		return (false);
 
 	for (action = ii->actions; action && action->mask != 0; action++) {
 		if (!(action->mask & cause))
 			continue;
 		fatal |= (action->action)(adap, action->arg, verbose);
 	}
 
 	/* clear */
 	t4_write_reg(adap, ii->cause_reg, cause);
 	(void)t4_read_reg(adap, ii->cause_reg);
 
 	return (fatal);
 }
 
 /*
  * Interrupt handler for the PCIE module.
  */
 static bool pcie_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details sysbus_intr_details[] = {
 		{ F_RNPP, "RXNP array parity error" },
 		{ F_RPCP, "RXPC array parity error" },
 		{ F_RCIP, "RXCIF array parity error" },
 		{ F_RCCP, "Rx completions control array parity error" },
 		{ F_RFTP, "RXFT array parity error" },
 		{ 0 }
 	};
 	static const struct intr_info sysbus_intr_info = {
 		.name = "PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS",
 		.cause_reg = A_PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
 		.enable_reg = A_PCIE_CORE_UTL_SYSTEM_BUS_AGENT_INTERRUPT_ENABLE,
 		.fatal = F_RFTP | F_RCCP | F_RCIP | F_RPCP | F_RNPP,
 		.details = sysbus_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_details pcie_port_intr_details[] = {
 		{ F_TPCP, "TXPC array parity error" },
 		{ F_TNPP, "TXNP array parity error" },
 		{ F_TFTP, "TXFT array parity error" },
 		{ F_TCAP, "TXCA array parity error" },
 		{ F_TCIP, "TXCIF array parity error" },
 		{ F_RCAP, "RXCA array parity error" },
 		{ F_OTDD, "outbound request TLP discarded" },
 		{ F_RDPE, "Rx data parity error" },
 		{ F_TDUE, "Tx uncorrectable data error" },
 		{ 0 }
 	};
 	static const struct intr_info pcie_port_intr_info = {
 		.name = "PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS",
 		.cause_reg = A_PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
 		.enable_reg = A_PCIE_CORE_UTL_PCI_EXPRESS_PORT_INTERRUPT_ENABLE,
 		.fatal = F_TPCP | F_TNPP | F_TFTP | F_TCAP | F_TCIP | F_RCAP |
 		    F_OTDD | F_RDPE | F_TDUE,
 		.details = pcie_port_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_details pcie_intr_details[] = {
 		{ F_MSIADDRLPERR, "MSI AddrL parity error" },
 		{ F_MSIADDRHPERR, "MSI AddrH parity error" },
 		{ F_MSIDATAPERR, "MSI data parity error" },
 		{ F_MSIXADDRLPERR, "MSI-X AddrL parity error" },
 		{ F_MSIXADDRHPERR, "MSI-X AddrH parity error" },
 		{ F_MSIXDATAPERR, "MSI-X data parity error" },
 		{ F_MSIXDIPERR, "MSI-X DI parity error" },
 		{ F_PIOCPLPERR, "PCIe PIO completion FIFO parity error" },
 		{ F_PIOREQPERR, "PCIe PIO request FIFO parity error" },
 		{ F_TARTAGPERR, "PCIe target tag FIFO parity error" },
 		{ F_CCNTPERR, "PCIe CMD channel count parity error" },
 		{ F_CREQPERR, "PCIe CMD channel request parity error" },
 		{ F_CRSPPERR, "PCIe CMD channel response parity error" },
 		{ F_DCNTPERR, "PCIe DMA channel count parity error" },
 		{ F_DREQPERR, "PCIe DMA channel request parity error" },
 		{ F_DRSPPERR, "PCIe DMA channel response parity error" },
 		{ F_HCNTPERR, "PCIe HMA channel count parity error" },
 		{ F_HREQPERR, "PCIe HMA channel request parity error" },
 		{ F_HRSPPERR, "PCIe HMA channel response parity error" },
 		{ F_CFGSNPPERR, "PCIe config snoop FIFO parity error" },
 		{ F_FIDPERR, "PCIe FID parity error" },
 		{ F_INTXCLRPERR, "PCIe INTx clear parity error" },
 		{ F_MATAGPERR, "PCIe MA tag parity error" },
 		{ F_PIOTAGPERR, "PCIe PIO tag parity error" },
 		{ F_RXCPLPERR, "PCIe Rx completion parity error" },
 		{ F_RXWRPERR, "PCIe Rx write parity error" },
 		{ F_RPLPERR, "PCIe replay buffer parity error" },
 		{ F_PCIESINT, "PCIe core secondary fault" },
 		{ F_PCIEPINT, "PCIe core primary fault" },
 		{ F_UNXSPLCPLERR, "PCIe unexpected split completion error" },
 		{ 0 }
 	};
 	static const struct intr_details t5_pcie_intr_details[] = {
 		{ F_IPGRPPERR, "Parity errors observed by IP" },
 		{ F_NONFATALERR, "PCIe non-fatal error" },
 		{ F_READRSPERR, "Outbound read error" },
 		{ F_TRGT1GRPPERR, "PCIe TRGT1 group FIFOs parity error" },
 		{ F_IPSOTPERR, "PCIe IP SOT buffer SRAM parity error" },
 		{ F_IPRETRYPERR, "PCIe IP replay buffer parity error" },
 		{ F_IPRXDATAGRPPERR, "PCIe IP Rx data group SRAMs parity error" },
 		{ F_IPRXHDRGRPPERR, "PCIe IP Rx header group SRAMs parity error" },
 		{ F_PIOTAGQPERR, "PIO tag queue FIFO parity error" },
 		{ F_MAGRPPERR, "MA group FIFO parity error" },
 		{ F_VFIDPERR, "VFID SRAM parity error" },
 		{ F_FIDPERR, "FID SRAM parity error" },
 		{ F_CFGSNPPERR, "config snoop FIFO parity error" },
 		{ F_HRSPPERR, "HMA channel response data SRAM parity error" },
 		{ F_HREQRDPERR, "HMA channel read request SRAM parity error" },
 		{ F_HREQWRPERR, "HMA channel write request SRAM parity error" },
 		{ F_DRSPPERR, "DMA channel response data SRAM parity error" },
 		{ F_DREQRDPERR, "DMA channel write request SRAM parity error" },
 		{ F_CRSPPERR, "CMD channel response data SRAM parity error" },
 		{ F_CREQRDPERR, "CMD channel read request SRAM parity error" },
 		{ F_MSTTAGQPERR, "PCIe master tag queue SRAM parity error" },
 		{ F_TGTTAGQPERR, "PCIe target tag queue FIFO parity error" },
 		{ F_PIOREQGRPPERR, "PIO request group FIFOs parity error" },
 		{ F_PIOCPLGRPPERR, "PIO completion group FIFOs parity error" },
 		{ F_MSIXDIPERR, "MSI-X DI SRAM parity error" },
 		{ F_MSIXDATAPERR, "MSI-X data SRAM parity error" },
 		{ F_MSIXADDRHPERR, "MSI-X AddrH SRAM parity error" },
 		{ F_MSIXADDRLPERR, "MSI-X AddrL SRAM parity error" },
 		{ F_MSIXSTIPERR, "MSI-X STI SRAM parity error" },
 		{ F_MSTTIMEOUTPERR, "Master timeout FIFO parity error" },
 		{ F_MSTGRPPERR, "Master response read queue SRAM parity error" },
 		{ 0 }
 	};
 	struct intr_info pcie_intr_info = {
 		.name = "PCIE_INT_CAUSE",
 		.cause_reg = A_PCIE_INT_CAUSE,
 		.enable_reg = A_PCIE_INT_ENABLE,
 		.fatal = 0,
 		.details = NULL,
 		.actions = NULL,
 	};
 	bool fatal = false;
 
 	if (is_t4(adap)) {
 		fatal |= t4_handle_intr(adap, &sysbus_intr_info, 0, verbose);
 		fatal |= t4_handle_intr(adap, &pcie_port_intr_info, 0, verbose);
 
 		pcie_intr_info.fatal =  0x3fffffc0;
 		pcie_intr_info.details = pcie_intr_details;
 	} else {
 		pcie_intr_info.fatal = is_t5(adap) ? 0xbfffff40 : 0x9fffff40;
 		pcie_intr_info.details = t5_pcie_intr_details;
 	}
 	fatal |= t4_handle_intr(adap, &pcie_intr_info, 0, verbose);
 
 	return (fatal);
 }
 
 /*
  * TP interrupt handler.
  */
 static bool tp_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details tp_intr_details[] = {
 		{ 0x3fffffff, "TP parity error" },
 		{ F_FLMTXFLSTEMPTY, "TP out of Tx pages" },
 		{ 0 }
 	};
 	static const struct intr_info tp_intr_info = {
 		.name = "TP_INT_CAUSE",
 		.cause_reg = A_TP_INT_CAUSE,
 		.enable_reg = A_TP_INT_ENABLE,
 		.fatal = 0x7fffffff,
 		.details = tp_intr_details,
 		.actions = NULL,
 	};
 
 	return (t4_handle_intr(adap, &tp_intr_info, 0, verbose));
 }
 
 /*
  * SGE interrupt handler.
  */
 static bool sge_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_info sge_int1_info = {
 		.name = "SGE_INT_CAUSE1",
 		.cause_reg = A_SGE_INT_CAUSE1,
 		.enable_reg = A_SGE_INT_ENABLE1,
 		.fatal = 0xffffffff,
 		.details = NULL,
 		.actions = NULL,
 	};
 	static const struct intr_info sge_int2_info = {
 		.name = "SGE_INT_CAUSE2",
 		.cause_reg = A_SGE_INT_CAUSE2,
 		.enable_reg = A_SGE_INT_ENABLE2,
 		.fatal = 0xffffffff,
 		.details = NULL,
 		.actions = NULL,
 	};
 	static const struct intr_details sge_int3_details[] = {
 		{ F_ERR_FLM_DBP,
 			"DBP pointer delivery for invalid context or QID" },
 		{ F_ERR_FLM_IDMA1 | F_ERR_FLM_IDMA0,
 			"Invalid QID or header request by IDMA" },
 		{ F_ERR_FLM_HINT, "FLM hint is for invalid context or QID" },
 		{ F_ERR_PCIE_ERROR3, "SGE PCIe error for DBP thread 3" },
 		{ F_ERR_PCIE_ERROR2, "SGE PCIe error for DBP thread 2" },
 		{ F_ERR_PCIE_ERROR1, "SGE PCIe error for DBP thread 1" },
 		{ F_ERR_PCIE_ERROR0, "SGE PCIe error for DBP thread 0" },
 		{ F_ERR_TIMER_ABOVE_MAX_QID,
 			"SGE GTS with timer 0-5 for IQID > 1023" },
 		{ F_ERR_CPL_EXCEED_IQE_SIZE,
 			"SGE received CPL exceeding IQE size" },
 		{ F_ERR_INVALID_CIDX_INC, "SGE GTS CIDX increment too large" },
 		{ F_ERR_ITP_TIME_PAUSED, "SGE ITP error" },
 		{ F_ERR_CPL_OPCODE_0, "SGE received 0-length CPL" },
 		{ F_ERR_DROPPED_DB, "SGE DB dropped" },
 		{ F_ERR_DATA_CPL_ON_HIGH_QID1 | F_ERR_DATA_CPL_ON_HIGH_QID0,
 		  "SGE IQID > 1023 received CPL for FL" },
 		{ F_ERR_BAD_DB_PIDX3 | F_ERR_BAD_DB_PIDX2 | F_ERR_BAD_DB_PIDX1 |
 			F_ERR_BAD_DB_PIDX0, "SGE DBP pidx increment too large" },
 		{ F_ERR_ING_PCIE_CHAN, "SGE Ingress PCIe channel mismatch" },
 		{ F_ERR_ING_CTXT_PRIO,
 			"Ingress context manager priority user error" },
 		{ F_ERR_EGR_CTXT_PRIO,
 			"Egress context manager priority user error" },
 		{ F_DBFIFO_HP_INT, "High priority DB FIFO threshold reached" },
 		{ F_DBFIFO_LP_INT, "Low priority DB FIFO threshold reached" },
 		{ F_REG_ADDRESS_ERR, "Undefined SGE register accessed" },
 		{ F_INGRESS_SIZE_ERR, "SGE illegal ingress QID" },
 		{ F_EGRESS_SIZE_ERR, "SGE illegal egress QID" },
 		{ 0x0000000f, "SGE context access for invalid queue" },
 		{ 0 }
 	};
 	static const struct intr_details t6_sge_int3_details[] = {
 		{ F_ERR_FLM_DBP,
 			"DBP pointer delivery for invalid context or QID" },
 		{ F_ERR_FLM_IDMA1 | F_ERR_FLM_IDMA0,
 			"Invalid QID or header request by IDMA" },
 		{ F_ERR_FLM_HINT, "FLM hint is for invalid context or QID" },
 		{ F_ERR_PCIE_ERROR3, "SGE PCIe error for DBP thread 3" },
 		{ F_ERR_PCIE_ERROR2, "SGE PCIe error for DBP thread 2" },
 		{ F_ERR_PCIE_ERROR1, "SGE PCIe error for DBP thread 1" },
 		{ F_ERR_PCIE_ERROR0, "SGE PCIe error for DBP thread 0" },
 		{ F_ERR_TIMER_ABOVE_MAX_QID,
 			"SGE GTS with timer 0-5 for IQID > 1023" },
 		{ F_ERR_CPL_EXCEED_IQE_SIZE,
 			"SGE received CPL exceeding IQE size" },
 		{ F_ERR_INVALID_CIDX_INC, "SGE GTS CIDX increment too large" },
 		{ F_ERR_ITP_TIME_PAUSED, "SGE ITP error" },
 		{ F_ERR_CPL_OPCODE_0, "SGE received 0-length CPL" },
 		{ F_ERR_DROPPED_DB, "SGE DB dropped" },
 		{ F_ERR_DATA_CPL_ON_HIGH_QID1 | F_ERR_DATA_CPL_ON_HIGH_QID0,
 			"SGE IQID > 1023 received CPL for FL" },
 		{ F_ERR_BAD_DB_PIDX3 | F_ERR_BAD_DB_PIDX2 | F_ERR_BAD_DB_PIDX1 |
 			F_ERR_BAD_DB_PIDX0, "SGE DBP pidx increment too large" },
 		{ F_ERR_ING_PCIE_CHAN, "SGE Ingress PCIe channel mismatch" },
 		{ F_ERR_ING_CTXT_PRIO,
 			"Ingress context manager priority user error" },
 		{ F_ERR_EGR_CTXT_PRIO,
 			"Egress context manager priority user error" },
 		{ F_DBP_TBUF_FULL, "SGE DBP tbuf full" },
 		{ F_FATAL_WRE_LEN,
 			"SGE WRE packet less than advertized length" },
 		{ F_REG_ADDRESS_ERR, "Undefined SGE register accessed" },
 		{ F_INGRESS_SIZE_ERR, "SGE illegal ingress QID" },
 		{ F_EGRESS_SIZE_ERR, "SGE illegal egress QID" },
 		{ 0x0000000f, "SGE context access for invalid queue" },
 		{ 0 }
 	};
 	struct intr_info sge_int3_info = {
 		.name = "SGE_INT_CAUSE3",
 		.cause_reg = A_SGE_INT_CAUSE3,
 		.enable_reg = A_SGE_INT_ENABLE3,
 		.fatal = F_ERR_CPL_EXCEED_IQE_SIZE,
 		.details = NULL,
 		.actions = NULL,
 	};
 	static const struct intr_info sge_int4_info = {
 		.name = "SGE_INT_CAUSE4",
 		.cause_reg = A_SGE_INT_CAUSE4,
 		.enable_reg = A_SGE_INT_ENABLE4,
 		.fatal = 0,
 		.details = NULL,
 		.actions = NULL,
 	};
 	static const struct intr_info sge_int5_info = {
 		.name = "SGE_INT_CAUSE5",
 		.cause_reg = A_SGE_INT_CAUSE5,
 		.enable_reg = A_SGE_INT_ENABLE5,
 		.fatal = 0xffffffff,
 		.details = NULL,
 		.actions = NULL,
 	};
 	static const struct intr_info sge_int6_info = {
 		.name = "SGE_INT_CAUSE6",
 		.cause_reg = A_SGE_INT_CAUSE6,
 		.enable_reg = A_SGE_INT_ENABLE6,
 		.fatal = 0,
 		.details = NULL,
 		.actions = NULL,
 	};
 
 	bool fatal;
 	u32 v;
 
 	if (chip_id(adap) <= CHELSIO_T5) {
 		sge_int3_info.details = sge_int3_details;
 	} else {
 		sge_int3_info.details = t6_sge_int3_details;
 	}
 
 	fatal = false;
 	fatal |= t4_handle_intr(adap, &sge_int1_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &sge_int2_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &sge_int3_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &sge_int4_info, 0, verbose);
 	if (chip_id(adap) >= CHELSIO_T5)
 		fatal |= t4_handle_intr(adap, &sge_int5_info, 0, verbose);
 	if (chip_id(adap) >= CHELSIO_T6)
 		fatal |= t4_handle_intr(adap, &sge_int6_info, 0, verbose);
 
 	v = t4_read_reg(adap, A_SGE_ERROR_STATS);
 	if (v & F_ERROR_QID_VALID) {
 		CH_ERR(adap, "SGE error for QID %u\n", G_ERROR_QID(v));
 		if (v & F_UNCAPTURED_ERROR)
 			CH_ERR(adap, "SGE UNCAPTURED_ERROR set (clearing)\n");
 		t4_write_reg(adap, A_SGE_ERROR_STATS,
 		    F_ERROR_QID_VALID | F_UNCAPTURED_ERROR);
 	}
 
 	return (fatal);
 }
 
 /*
  * CIM interrupt handler.
  */
 static bool cim_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_action cim_host_intr_actions[] = {
 		{ F_TIMER0INT, 0, t4_os_dump_cimla },
 		{ 0 },
 	};
 	static const struct intr_details cim_host_intr_details[] = {
 		/* T6+ */
 		{ F_PCIE2CIMINTFPARERR, "CIM IBQ PCIe interface parity error" },
 
 		/* T5+ */
 		{ F_MA_CIM_INTFPERR, "MA2CIM interface parity error" },
 		{ F_PLCIM_MSTRSPDATAPARERR,
 			"PL2CIM master response data parity error" },
 		{ F_NCSI2CIMINTFPARERR, "CIM IBQ NC-SI interface parity error" },
 		{ F_SGE2CIMINTFPARERR, "CIM IBQ SGE interface parity error" },
 		{ F_ULP2CIMINTFPARERR, "CIM IBQ ULP_TX interface parity error" },
 		{ F_TP2CIMINTFPARERR, "CIM IBQ TP interface parity error" },
 		{ F_OBQSGERX1PARERR, "CIM OBQ SGE1_RX parity error" },
 		{ F_OBQSGERX0PARERR, "CIM OBQ SGE0_RX parity error" },
 
 		/* T4+ */
 		{ F_TIEQOUTPARERRINT, "CIM TIEQ outgoing FIFO parity error" },
 		{ F_TIEQINPARERRINT, "CIM TIEQ incoming FIFO parity error" },
 		{ F_MBHOSTPARERR, "CIM mailbox host read parity error" },
 		{ F_MBUPPARERR, "CIM mailbox uP parity error" },
 		{ F_IBQTP0PARERR, "CIM IBQ TP0 parity error" },
 		{ F_IBQTP1PARERR, "CIM IBQ TP1 parity error" },
 		{ F_IBQULPPARERR, "CIM IBQ ULP parity error" },
 		{ F_IBQSGELOPARERR, "CIM IBQ SGE_LO parity error" },
 		{ F_IBQSGEHIPARERR | F_IBQPCIEPARERR,	/* same bit */
 			"CIM IBQ PCIe/SGE_HI parity error" },
 		{ F_IBQNCSIPARERR, "CIM IBQ NC-SI parity error" },
 		{ F_OBQULP0PARERR, "CIM OBQ ULP0 parity error" },
 		{ F_OBQULP1PARERR, "CIM OBQ ULP1 parity error" },
 		{ F_OBQULP2PARERR, "CIM OBQ ULP2 parity error" },
 		{ F_OBQULP3PARERR, "CIM OBQ ULP3 parity error" },
 		{ F_OBQSGEPARERR, "CIM OBQ SGE parity error" },
 		{ F_OBQNCSIPARERR, "CIM OBQ NC-SI parity error" },
 		{ F_TIMER1INT, "CIM TIMER0 interrupt" },
 		{ F_TIMER0INT, "CIM TIMER0 interrupt" },
 		{ F_PREFDROPINT, "CIM control register prefetch drop" },
 		{ 0}
 	};
 	struct intr_info cim_host_intr_info = {
 		.name = "CIM_HOST_INT_CAUSE",
 		.cause_reg = A_CIM_HOST_INT_CAUSE,
 		.enable_reg = A_CIM_HOST_INT_ENABLE,
 		.fatal = 0,
 		.details = cim_host_intr_details,
 		.actions = cim_host_intr_actions,
 	};
 	static const struct intr_details cim_host_upacc_intr_details[] = {
 		{ F_EEPROMWRINT, "CIM EEPROM came out of busy state" },
 		{ F_TIMEOUTMAINT, "CIM PIF MA timeout" },
 		{ F_TIMEOUTINT, "CIM PIF timeout" },
 		{ F_RSPOVRLOOKUPINT, "CIM response FIFO overwrite" },
 		{ F_REQOVRLOOKUPINT, "CIM request FIFO overwrite" },
 		{ F_BLKWRPLINT, "CIM block write to PL space" },
 		{ F_BLKRDPLINT, "CIM block read from PL space" },
 		{ F_SGLWRPLINT,
 			"CIM single write to PL space with illegal BEs" },
 		{ F_SGLRDPLINT,
 			"CIM single read from PL space with illegal BEs" },
 		{ F_BLKWRCTLINT, "CIM block write to CTL space" },
 		{ F_BLKRDCTLINT, "CIM block read from CTL space" },
 		{ F_SGLWRCTLINT,
 			"CIM single write to CTL space with illegal BEs" },
 		{ F_SGLRDCTLINT,
 			"CIM single read from CTL space with illegal BEs" },
 		{ F_BLKWREEPROMINT, "CIM block write to EEPROM space" },
 		{ F_BLKRDEEPROMINT, "CIM block read from EEPROM space" },
 		{ F_SGLWREEPROMINT,
 			"CIM single write to EEPROM space with illegal BEs" },
 		{ F_SGLRDEEPROMINT,
 			"CIM single read from EEPROM space with illegal BEs" },
 		{ F_BLKWRFLASHINT, "CIM block write to flash space" },
 		{ F_BLKRDFLASHINT, "CIM block read from flash space" },
 		{ F_SGLWRFLASHINT, "CIM single write to flash space" },
 		{ F_SGLRDFLASHINT,
 			"CIM single read from flash space with illegal BEs" },
 		{ F_BLKWRBOOTINT, "CIM block write to boot space" },
 		{ F_BLKRDBOOTINT, "CIM block read from boot space" },
 		{ F_SGLWRBOOTINT, "CIM single write to boot space" },
 		{ F_SGLRDBOOTINT,
 			"CIM single read from boot space with illegal BEs" },
 		{ F_ILLWRBEINT, "CIM illegal write BEs" },
 		{ F_ILLRDBEINT, "CIM illegal read BEs" },
 		{ F_ILLRDINT, "CIM illegal read" },
 		{ F_ILLWRINT, "CIM illegal write" },
 		{ F_ILLTRANSINT, "CIM illegal transaction" },
 		{ F_RSVDSPACEINT, "CIM reserved space access" },
 		{0}
 	};
 	static const struct intr_info cim_host_upacc_intr_info = {
 		.name = "CIM_HOST_UPACC_INT_CAUSE",
 		.cause_reg = A_CIM_HOST_UPACC_INT_CAUSE,
 		.enable_reg = A_CIM_HOST_UPACC_INT_ENABLE,
 		.fatal = 0x3fffeeff,
 		.details = cim_host_upacc_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_info cim_pf_host_intr_info = {
 		.name = "CIM_PF_HOST_INT_CAUSE",
 		.cause_reg = MYPF_REG(A_CIM_PF_HOST_INT_CAUSE),
 		.enable_reg = MYPF_REG(A_CIM_PF_HOST_INT_ENABLE),
 		.fatal = 0,
 		.details = NULL,
 		.actions = NULL,
 	};
 	u32 val, fw_err;
 	bool fatal;
 
 	fw_err = t4_read_reg(adap, A_PCIE_FW);
 	if (fw_err & F_PCIE_FW_ERR)
 		t4_report_fw_error(adap);
 
 	/*
 	 * When the Firmware detects an internal error which normally wouldn't
 	 * raise a Host Interrupt, it forces a CIM Timer0 interrupt in order
 	 * to make sure the Host sees the Firmware Crash.  So if we have a
 	 * Timer0 interrupt and don't see a Firmware Crash, ignore the Timer0
 	 * interrupt.
 	 */
 	val = t4_read_reg(adap, A_CIM_HOST_INT_CAUSE);
 	if (val & F_TIMER0INT && (!(fw_err & F_PCIE_FW_ERR) ||
 	    G_PCIE_FW_EVAL(fw_err) != PCIE_FW_EVAL_CRASH)) {
 		t4_write_reg(adap, A_CIM_HOST_INT_CAUSE, F_TIMER0INT);
 	}
 
 	fatal = false;
 	if (is_t4(adap))
 		cim_host_intr_info.fatal = 0x001fffe2;
 	else if (is_t5(adap))
 		cim_host_intr_info.fatal = 0x007dffe2;
 	else
 		cim_host_intr_info.fatal = 0x007dffe6;
 	fatal |= t4_handle_intr(adap, &cim_host_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &cim_host_upacc_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &cim_pf_host_intr_info, 0, verbose);
 
 	return (fatal);
 }
 
 /*
  * ULP RX interrupt handler.
  */
 static bool ulprx_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details ulprx_intr_details[] = {
 		/* T5+ */
 		{ F_SE_CNT_MISMATCH_1, "ULPRX SE count mismatch in channel 1" },
 		{ F_SE_CNT_MISMATCH_0, "ULPRX SE count mismatch in channel 0" },
 
 		/* T4+ */
 		{ F_CAUSE_CTX_1, "ULPRX channel 1 context error" },
 		{ F_CAUSE_CTX_0, "ULPRX channel 0 context error" },
 		{ 0x007fffff, "ULPRX parity error" },
 		{ 0 }
 	};
 	static const struct intr_info ulprx_intr_info = {
 		.name = "ULP_RX_INT_CAUSE",
 		.cause_reg = A_ULP_RX_INT_CAUSE,
 		.enable_reg = A_ULP_RX_INT_ENABLE,
 		.fatal = 0x07ffffff,
 		.details = ulprx_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_info ulprx_intr2_info = {
 		.name = "ULP_RX_INT_CAUSE_2",
 		.cause_reg = A_ULP_RX_INT_CAUSE_2,
 		.enable_reg = A_ULP_RX_INT_ENABLE_2,
 		.fatal = 0,
 		.details = NULL,
 		.actions = NULL,
 	};
 	bool fatal = false;
 
 	fatal |= t4_handle_intr(adap, &ulprx_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &ulprx_intr2_info, 0, verbose);
 
 	return (fatal);
 }
 
 /*
  * ULP TX interrupt handler.
  */
 static bool ulptx_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details ulptx_intr_details[] = {
 		{ F_PBL_BOUND_ERR_CH3, "ULPTX channel 3 PBL out of bounds" },
 		{ F_PBL_BOUND_ERR_CH2, "ULPTX channel 2 PBL out of bounds" },
 		{ F_PBL_BOUND_ERR_CH1, "ULPTX channel 1 PBL out of bounds" },
 		{ F_PBL_BOUND_ERR_CH0, "ULPTX channel 0 PBL out of bounds" },
 		{ 0x0fffffff, "ULPTX parity error" },
 		{ 0 }
 	};
 	static const struct intr_info ulptx_intr_info = {
 		.name = "ULP_TX_INT_CAUSE",
 		.cause_reg = A_ULP_TX_INT_CAUSE,
 		.enable_reg = A_ULP_TX_INT_ENABLE,
 		.fatal = 0x0fffffff,
 		.details = ulptx_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_info ulptx_intr2_info = {
 		.name = "ULP_TX_INT_CAUSE_2",
 		.cause_reg = A_ULP_TX_INT_CAUSE_2,
 		.enable_reg = A_ULP_TX_INT_ENABLE_2,
 		.fatal = 0,
 		.details = NULL,
 		.actions = NULL,
 	};
 	bool fatal = false;
 
 	fatal |= t4_handle_intr(adap, &ulptx_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &ulptx_intr2_info, 0, verbose);
 
 	return (fatal);
 }
 
 static bool pmtx_dump_dbg_stats(struct adapter *adap, int arg, bool verbose)
 {
 	int i;
 	u32 data[17];
 
 	t4_read_indirect(adap, A_PM_TX_DBG_CTRL, A_PM_TX_DBG_DATA, &data[0],
 	    ARRAY_SIZE(data), A_PM_TX_DBG_STAT0);
 	for (i = 0; i < ARRAY_SIZE(data); i++) {
 		CH_ALERT(adap, "  - PM_TX_DBG_STAT%u (0x%x) = 0x%08x\n", i,
 		    A_PM_TX_DBG_STAT0 + i, data[i]);
 	}
 
 	return (false);
 }
 
 /*
  * PM TX interrupt handler.
  */
 static bool pmtx_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_action pmtx_intr_actions[] = {
 		{ 0xffffffff, 0, pmtx_dump_dbg_stats },
 		{ 0 },
 	};
 	static const struct intr_details pmtx_intr_details[] = {
 		{ F_PCMD_LEN_OVFL0, "PMTX channel 0 pcmd too large" },
 		{ F_PCMD_LEN_OVFL1, "PMTX channel 1 pcmd too large" },
 		{ F_PCMD_LEN_OVFL2, "PMTX channel 2 pcmd too large" },
 		{ F_ZERO_C_CMD_ERROR, "PMTX 0-length pcmd" },
 		{ 0x0f000000, "PMTX icspi FIFO2X Rx framing error" },
 		{ 0x00f00000, "PMTX icspi FIFO Rx framing error" },
 		{ 0x000f0000, "PMTX icspi FIFO Tx framing error" },
 		{ 0x0000f000, "PMTX oespi FIFO Rx framing error" },
 		{ 0x00000f00, "PMTX oespi FIFO Tx framing error" },
 		{ 0x000000f0, "PMTX oespi FIFO2X Tx framing error" },
 		{ F_OESPI_PAR_ERROR, "PMTX oespi parity error" },
 		{ F_DB_OPTIONS_PAR_ERROR, "PMTX db_options parity error" },
 		{ F_ICSPI_PAR_ERROR, "PMTX icspi parity error" },
 		{ F_C_PCMD_PAR_ERROR, "PMTX c_pcmd parity error" },
 		{ 0 }
 	};
 	static const struct intr_info pmtx_intr_info = {
 		.name = "PM_TX_INT_CAUSE",
 		.cause_reg = A_PM_TX_INT_CAUSE,
 		.enable_reg = A_PM_TX_INT_ENABLE,
 		.fatal = 0xffffffff,
 		.details = pmtx_intr_details,
 		.actions = pmtx_intr_actions,
 	};
 
 	return (t4_handle_intr(adap, &pmtx_intr_info, 0, verbose));
 }
 
 /*
  * PM RX interrupt handler.
  */
 static bool pmrx_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details pmrx_intr_details[] = {
 		/* T6+ */
 		{ 0x18000000, "PMRX ospi overflow" },
 		{ F_MA_INTF_SDC_ERR, "PMRX MA interface SDC parity error" },
 		{ F_BUNDLE_LEN_PARERR, "PMRX bundle len FIFO parity error" },
 		{ F_BUNDLE_LEN_OVFL, "PMRX bundle len FIFO overflow" },
 		{ F_SDC_ERR, "PMRX SDC error" },
 
 		/* T4+ */
 		{ F_ZERO_E_CMD_ERROR, "PMRX 0-length pcmd" },
 		{ 0x003c0000, "PMRX iespi FIFO2X Rx framing error" },
 		{ 0x0003c000, "PMRX iespi Rx framing error" },
 		{ 0x00003c00, "PMRX iespi Tx framing error" },
 		{ 0x00000300, "PMRX ocspi Rx framing error" },
 		{ 0x000000c0, "PMRX ocspi Tx framing error" },
 		{ 0x00000030, "PMRX ocspi FIFO2X Tx framing error" },
 		{ F_OCSPI_PAR_ERROR, "PMRX ocspi parity error" },
 		{ F_DB_OPTIONS_PAR_ERROR, "PMRX db_options parity error" },
 		{ F_IESPI_PAR_ERROR, "PMRX iespi parity error" },
 		{ F_E_PCMD_PAR_ERROR, "PMRX e_pcmd parity error"},
 		{ 0 }
 	};
 	static const struct intr_info pmrx_intr_info = {
 		.name = "PM_RX_INT_CAUSE",
 		.cause_reg = A_PM_RX_INT_CAUSE,
 		.enable_reg = A_PM_RX_INT_ENABLE,
 		.fatal = 0x1fffffff,
 		.details = pmrx_intr_details,
 		.actions = NULL,
 	};
 
 	return (t4_handle_intr(adap, &pmrx_intr_info, 0, verbose));
 }
 
 /*
  * CPL switch interrupt handler.
  */
 static bool cplsw_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details cplsw_intr_details[] = {
 		/* T5+ */
 		{ F_PERR_CPL_128TO128_1, "CPLSW 128TO128 FIFO1 parity error" },
 		{ F_PERR_CPL_128TO128_0, "CPLSW 128TO128 FIFO0 parity error" },
 
 		/* T4+ */
 		{ F_CIM_OP_MAP_PERR, "CPLSW CIM op_map parity error" },
 		{ F_CIM_OVFL_ERROR, "CPLSW CIM overflow" },
 		{ F_TP_FRAMING_ERROR, "CPLSW TP framing error" },
 		{ F_SGE_FRAMING_ERROR, "CPLSW SGE framing error" },
 		{ F_CIM_FRAMING_ERROR, "CPLSW CIM framing error" },
 		{ F_ZERO_SWITCH_ERROR, "CPLSW no-switch error" },
 		{ 0 }
 	};
 	struct intr_info cplsw_intr_info = {
 		.name = "CPL_INTR_CAUSE",
 		.cause_reg = A_CPL_INTR_CAUSE,
 		.enable_reg = A_CPL_INTR_ENABLE,
 		.fatal = 0,
 		.details = cplsw_intr_details,
 		.actions = NULL,
 	};
 
 	if (is_t4(adap))
 		cplsw_intr_info.fatal = 0x2f;
 	else if (is_t5(adap))
 		cplsw_intr_info.fatal = 0xef;
 	else
 		cplsw_intr_info.fatal = 0xff;
 
 	return (t4_handle_intr(adap, &cplsw_intr_info, 0, verbose));
 }
 
 #define T4_LE_FATAL_MASK (F_PARITYERR | F_UNKNOWNCMD | F_REQQPARERR)
 #define T6_LE_PERRCRC_MASK (F_PIPELINEERR | F_CLIPTCAMACCFAIL | \
     F_SRVSRAMACCFAIL | F_CLCAMCRCPARERR | F_CLCAMINTPERR | F_SSRAMINTPERR | \
     F_SRVSRAMPERR | F_VFSRAMPERR | F_TCAMINTPERR | F_TCAMCRCERR | \
     F_HASHTBLMEMACCERR | F_MAIFWRINTPERR | F_HASHTBLMEMCRCERR)
 #define T6_LE_FATAL_MASK (T6_LE_PERRCRC_MASK | F_T6_UNKNOWNCMD | \
     F_TCAMACCFAIL | F_HASHTBLACCFAIL | F_CMDTIDERR | F_CMDPRSRINTERR | \
     F_TOTCNTERR | F_CLCAMFIFOERR | F_CLIPSUBERR)
 
 /*
  * LE interrupt handler.
  */
 static bool le_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details le_intr_details[] = {
 		{ F_REQQPARERR, "LE request queue parity error" },
 		{ F_UNKNOWNCMD, "LE unknown command" },
 		{ F_ACTRGNFULL, "LE active region full" },
 		{ F_PARITYERR, "LE parity error" },
 		{ F_LIPMISS, "LE LIP miss" },
 		{ F_LIP0, "LE 0 LIP error" },
 		{ 0 }
 	};
 	static const struct intr_details t6_le_intr_details[] = {
 		{ F_CLIPSUBERR, "LE CLIP CAM reverse substitution error" },
 		{ F_CLCAMFIFOERR, "LE CLIP CAM internal FIFO error" },
 		{ F_CTCAMINVLDENT, "Invalid IPv6 CLIP TCAM entry" },
 		{ F_TCAMINVLDENT, "Invalid IPv6 TCAM entry" },
 		{ F_TOTCNTERR, "LE total active < TCAM count" },
 		{ F_CMDPRSRINTERR, "LE internal error in parser" },
 		{ F_CMDTIDERR, "Incorrect tid in LE command" },
 		{ F_T6_ACTRGNFULL, "LE active region full" },
 		{ F_T6_ACTCNTIPV6TZERO, "LE IPv6 active open TCAM counter -ve" },
 		{ F_T6_ACTCNTIPV4TZERO, "LE IPv4 active open TCAM counter -ve" },
 		{ F_T6_ACTCNTIPV6ZERO, "LE IPv6 active open counter -ve" },
 		{ F_T6_ACTCNTIPV4ZERO, "LE IPv4 active open counter -ve" },
 		{ F_HASHTBLACCFAIL, "Hash table read error (proto conflict)" },
 		{ F_TCAMACCFAIL, "LE TCAM access failure" },
 		{ F_T6_UNKNOWNCMD, "LE unknown command" },
 		{ F_T6_LIP0, "LE found 0 LIP during CLIP substitution" },
 		{ F_T6_LIPMISS, "LE CLIP lookup miss" },
 		{ T6_LE_PERRCRC_MASK, "LE parity/CRC error" },
 		{ 0 }
 	};
 	struct intr_info le_intr_info = {
 		.name = "LE_DB_INT_CAUSE",
 		.cause_reg = A_LE_DB_INT_CAUSE,
 		.enable_reg = A_LE_DB_INT_ENABLE,
 		.fatal = 0,
 		.details = NULL,
 		.actions = NULL,
 	};
 
 	if (chip_id(adap) <= CHELSIO_T5) {
 		le_intr_info.details = le_intr_details;
 		le_intr_info.fatal = T4_LE_FATAL_MASK;
 		if (is_t5(adap))
 			le_intr_info.fatal |= F_VFPARERR;
 	} else {
 		le_intr_info.details = t6_le_intr_details;
 		le_intr_info.fatal = T6_LE_FATAL_MASK;
 	}
 
 	return (t4_handle_intr(adap, &le_intr_info, 0, verbose));
 }
 
 /*
  * MPS interrupt handler.
  */
 static bool mps_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details mps_rx_perr_intr_details[] = {
 		{ 0xffffffff, "MPS Rx parity error" },
 		{ 0 }
 	};
 	static const struct intr_info mps_rx_perr_intr_info = {
 		.name = "MPS_RX_PERR_INT_CAUSE",
 		.cause_reg = A_MPS_RX_PERR_INT_CAUSE,
 		.enable_reg = A_MPS_RX_PERR_INT_ENABLE,
 		.fatal = 0xffffffff,
 		.details = mps_rx_perr_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_details mps_tx_intr_details[] = {
 		{ F_PORTERR, "MPS Tx destination port is disabled" },
 		{ F_FRMERR, "MPS Tx framing error" },
 		{ F_SECNTERR, "MPS Tx SOP/EOP error" },
 		{ F_BUBBLE, "MPS Tx underflow" },
 		{ V_TXDESCFIFO(M_TXDESCFIFO), "MPS Tx desc FIFO parity error" },
 		{ V_TXDATAFIFO(M_TXDATAFIFO), "MPS Tx data FIFO parity error" },
 		{ F_NCSIFIFO, "MPS Tx NC-SI FIFO parity error" },
 		{ V_TPFIFO(M_TPFIFO), "MPS Tx TP FIFO parity error" },
 		{ 0 }
 	};
 	struct intr_info mps_tx_intr_info = {
 		.name = "MPS_TX_INT_CAUSE",
 		.cause_reg = A_MPS_TX_INT_CAUSE,
 		.enable_reg = A_MPS_TX_INT_ENABLE,
 		.fatal = 0x1ffff,
 		.details = mps_tx_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_details mps_trc_intr_details[] = {
 		{ F_MISCPERR, "MPS TRC misc parity error" },
 		{ V_PKTFIFO(M_PKTFIFO), "MPS TRC packet FIFO parity error" },
 		{ V_FILTMEM(M_FILTMEM), "MPS TRC filter parity error" },
 		{ 0 }
 	};
 	static const struct intr_info mps_trc_intr_info = {
 		.name = "MPS_TRC_INT_CAUSE",
 		.cause_reg = A_MPS_TRC_INT_CAUSE,
 		.enable_reg = A_MPS_TRC_INT_ENABLE,
 		.fatal = F_MISCPERR | V_PKTFIFO(M_PKTFIFO) | V_FILTMEM(M_FILTMEM),
 		.details = mps_trc_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_details mps_stat_sram_intr_details[] = {
 		{ 0xffffffff, "MPS statistics SRAM parity error" },
 		{ 0 }
 	};
 	static const struct intr_info mps_stat_sram_intr_info = {
 		.name = "MPS_STAT_PERR_INT_CAUSE_SRAM",
 		.cause_reg = A_MPS_STAT_PERR_INT_CAUSE_SRAM,
 		.enable_reg = A_MPS_STAT_PERR_INT_ENABLE_SRAM,
 		.fatal = 0x1fffffff,
 		.details = mps_stat_sram_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_details mps_stat_tx_intr_details[] = {
 		{ 0xffffff, "MPS statistics Tx FIFO parity error" },
 		{ 0 }
 	};
 	static const struct intr_info mps_stat_tx_intr_info = {
 		.name = "MPS_STAT_PERR_INT_CAUSE_TX_FIFO",
 		.cause_reg = A_MPS_STAT_PERR_INT_CAUSE_TX_FIFO,
 		.enable_reg = A_MPS_STAT_PERR_INT_ENABLE_TX_FIFO,
 		.fatal =  0xffffff,
 		.details = mps_stat_tx_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_details mps_stat_rx_intr_details[] = {
 		{ 0xffffff, "MPS statistics Rx FIFO parity error" },
 		{ 0 }
 	};
 	static const struct intr_info mps_stat_rx_intr_info = {
 		.name = "MPS_STAT_PERR_INT_CAUSE_RX_FIFO",
 		.cause_reg = A_MPS_STAT_PERR_INT_CAUSE_RX_FIFO,
 		.enable_reg = A_MPS_STAT_PERR_INT_ENABLE_RX_FIFO,
 		.fatal =  0xffffff,
 		.details = mps_stat_rx_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_details mps_cls_intr_details[] = {
 		{ F_HASHSRAM, "MPS hash SRAM parity error" },
 		{ F_MATCHTCAM, "MPS match TCAM parity error" },
 		{ F_MATCHSRAM, "MPS match SRAM parity error" },
 		{ 0 }
 	};
 	static const struct intr_info mps_cls_intr_info = {
 		.name = "MPS_CLS_INT_CAUSE",
 		.cause_reg = A_MPS_CLS_INT_CAUSE,
 		.enable_reg = A_MPS_CLS_INT_ENABLE,
 		.fatal =  F_MATCHSRAM | F_MATCHTCAM | F_HASHSRAM,
 		.details = mps_cls_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_details mps_stat_sram1_intr_details[] = {
 		{ 0xff, "MPS statistics SRAM1 parity error" },
 		{ 0 }
 	};
 	static const struct intr_info mps_stat_sram1_intr_info = {
 		.name = "MPS_STAT_PERR_INT_CAUSE_SRAM1",
 		.cause_reg = A_MPS_STAT_PERR_INT_CAUSE_SRAM1,
 		.enable_reg = A_MPS_STAT_PERR_INT_ENABLE_SRAM1,
 		.fatal = 0xff,
 		.details = mps_stat_sram1_intr_details,
 		.actions = NULL,
 	};
 
 	bool fatal;
 
 	if (chip_id(adap) == CHELSIO_T6)
 		mps_tx_intr_info.fatal &= ~F_BUBBLE;
 
 	fatal = false;
 	fatal |= t4_handle_intr(adap, &mps_rx_perr_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &mps_tx_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &mps_trc_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &mps_stat_sram_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &mps_stat_tx_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &mps_stat_rx_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &mps_cls_intr_info, 0, verbose);
 	if (chip_id(adap) > CHELSIO_T4) {
 		fatal |= t4_handle_intr(adap, &mps_stat_sram1_intr_info, 0,
 		    verbose);
 	}
 
 	t4_write_reg(adap, A_MPS_INT_CAUSE, is_t4(adap) ? 0 : 0xffffffff);
 	t4_read_reg(adap, A_MPS_INT_CAUSE);	/* flush */
 
 	return (fatal);
 
 }
 
 /*
  * EDC/MC interrupt handler.
  */
 static bool mem_intr_handler(struct adapter *adap, int idx, bool verbose)
 {
 	static const char name[4][5] = { "EDC0", "EDC1", "MC0", "MC1" };
 	unsigned int count_reg, v;
 	static const struct intr_details mem_intr_details[] = {
 		{ F_ECC_UE_INT_CAUSE, "Uncorrectable ECC data error(s)" },
 		{ F_ECC_CE_INT_CAUSE, "Correctable ECC data error(s)" },
 		{ F_PERR_INT_CAUSE, "FIFO parity error" },
 		{ 0 }
 	};
 	struct intr_info ii = {
 		.fatal = F_PERR_INT_CAUSE | F_ECC_UE_INT_CAUSE,
 		.details = mem_intr_details,
 		.actions = NULL,
 	};
 	bool fatal;
 
 	switch (idx) {
 	case MEM_EDC0:
 		ii.name = "EDC0_INT_CAUSE";
 		ii.cause_reg = EDC_REG(A_EDC_INT_CAUSE, 0);
 		ii.enable_reg = EDC_REG(A_EDC_INT_ENABLE, 0);
 		count_reg = EDC_REG(A_EDC_ECC_STATUS, 0);
 		break;
 	case MEM_EDC1:
 		ii.name = "EDC1_INT_CAUSE";
 		ii.cause_reg = EDC_REG(A_EDC_INT_CAUSE, 1);
 		ii.enable_reg = EDC_REG(A_EDC_INT_ENABLE, 1);
 		count_reg = EDC_REG(A_EDC_ECC_STATUS, 1);
 		break;
 	case MEM_MC0:
 		ii.name = "MC0_INT_CAUSE";
 		if (is_t4(adap)) {
 			ii.cause_reg = A_MC_INT_CAUSE;
 			ii.enable_reg = A_MC_INT_ENABLE;
 			count_reg = A_MC_ECC_STATUS;
 		} else {
 			ii.cause_reg = A_MC_P_INT_CAUSE;
 			ii.enable_reg = A_MC_P_INT_ENABLE;
 			count_reg = A_MC_P_ECC_STATUS;
 		}
 		break;
 	case MEM_MC1:
 		ii.name = "MC1_INT_CAUSE";
 		ii.cause_reg = MC_REG(A_MC_P_INT_CAUSE, 1);
 		ii.enable_reg = MC_REG(A_MC_P_INT_ENABLE, 1);
 		count_reg = MC_REG(A_MC_P_ECC_STATUS, 1);
 		break;
 	}
 
 	fatal = t4_handle_intr(adap, &ii, 0, verbose);
 
 	v = t4_read_reg(adap, count_reg);
 	if (v != 0) {
 		if (G_ECC_UECNT(v) != 0) {
 			CH_ALERT(adap,
 			    "%s: %u uncorrectable ECC data error(s)\n",
 			    name[idx], G_ECC_UECNT(v));
 		}
 		if (G_ECC_CECNT(v) != 0) {
 			if (idx <= MEM_EDC1)
 				t4_edc_err_read(adap, idx);
 			CH_WARN_RATELIMIT(adap,
 			    "%s: %u correctable ECC data error(s)\n",
 			    name[idx], G_ECC_CECNT(v));
 		}
 		t4_write_reg(adap, count_reg, 0xffffffff);
 	}
 
 	return (fatal);
 }
 
 static bool ma_wrap_status(struct adapter *adap, int arg, bool verbose)
 {
 	u32 v;
 
 	v = t4_read_reg(adap, A_MA_INT_WRAP_STATUS);
 	CH_ALERT(adap,
 	    "MA address wrap-around error by client %u to address %#x\n",
 	    G_MEM_WRAP_CLIENT_NUM(v), G_MEM_WRAP_ADDRESS(v) << 4);
 	t4_write_reg(adap, A_MA_INT_WRAP_STATUS, v);
 
 	return (false);
 }
 
 
 /*
  * MA interrupt handler.
  */
 static bool ma_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_action ma_intr_actions[] = {
 		{ F_MEM_WRAP_INT_CAUSE, 0, ma_wrap_status },
 		{ 0 },
 	};
 	static const struct intr_info ma_intr_info = {
 		.name = "MA_INT_CAUSE",
 		.cause_reg = A_MA_INT_CAUSE,
 		.enable_reg = A_MA_INT_ENABLE,
 		.fatal = F_MEM_WRAP_INT_CAUSE | F_MEM_PERR_INT_CAUSE |
 		    F_MEM_TO_INT_CAUSE,
 		.details = NULL,
 		.actions = ma_intr_actions,
 	};
 	static const struct intr_info ma_perr_status1 = {
 		.name = "MA_PARITY_ERROR_STATUS1",
 		.cause_reg = A_MA_PARITY_ERROR_STATUS1,
 		.enable_reg = A_MA_PARITY_ERROR_ENABLE1,
 		.fatal = 0xffffffff,
 		.details = NULL,
 		.actions = NULL,
 	};
 	static const struct intr_info ma_perr_status2 = {
 		.name = "MA_PARITY_ERROR_STATUS2",
 		.cause_reg = A_MA_PARITY_ERROR_STATUS2,
 		.enable_reg = A_MA_PARITY_ERROR_ENABLE2,
 		.fatal = 0xffffffff,
 		.details = NULL,
 		.actions = NULL,
 	};
 	bool fatal;
 
 	fatal = false;
 	fatal |= t4_handle_intr(adap, &ma_intr_info, 0, verbose);
 	fatal |= t4_handle_intr(adap, &ma_perr_status1, 0, verbose);
 	if (chip_id(adap) > CHELSIO_T4)
 		fatal |= t4_handle_intr(adap, &ma_perr_status2, 0, verbose);
 
 	return (fatal);
 }
 
 /*
  * SMB interrupt handler.
  */
 static bool smb_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details smb_intr_details[] = {
 		{ F_MSTTXFIFOPARINT, "SMB master Tx FIFO parity error" },
 		{ F_MSTRXFIFOPARINT, "SMB master Rx FIFO parity error" },
 		{ F_SLVFIFOPARINT, "SMB slave FIFO parity error" },
 		{ 0 }
 	};
 	static const struct intr_info smb_intr_info = {
 		.name = "SMB_INT_CAUSE",
 		.cause_reg = A_SMB_INT_CAUSE,
 		.enable_reg = A_SMB_INT_ENABLE,
 		.fatal = F_SLVFIFOPARINT | F_MSTRXFIFOPARINT | F_MSTTXFIFOPARINT,
 		.details = smb_intr_details,
 		.actions = NULL,
 	};
 
 	return (t4_handle_intr(adap, &smb_intr_info, 0, verbose));
 }
 
 /*
  * NC-SI interrupt handler.
  */
 static bool ncsi_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details ncsi_intr_details[] = {
 		{ F_CIM_DM_PRTY_ERR, "NC-SI CIM parity error" },
 		{ F_MPS_DM_PRTY_ERR, "NC-SI MPS parity error" },
 		{ F_TXFIFO_PRTY_ERR, "NC-SI Tx FIFO parity error" },
 		{ F_RXFIFO_PRTY_ERR, "NC-SI Rx FIFO parity error" },
 		{ 0 }
 	};
 	static const struct intr_info ncsi_intr_info = {
 		.name = "NCSI_INT_CAUSE",
 		.cause_reg = A_NCSI_INT_CAUSE,
 		.enable_reg = A_NCSI_INT_ENABLE,
 		.fatal = F_RXFIFO_PRTY_ERR | F_TXFIFO_PRTY_ERR |
 		    F_MPS_DM_PRTY_ERR | F_CIM_DM_PRTY_ERR,
 		.details = ncsi_intr_details,
 		.actions = NULL,
 	};
 
 	return (t4_handle_intr(adap, &ncsi_intr_info, 0, verbose));
 }
 
 /*
  * MAC interrupt handler.
  */
 static bool mac_intr_handler(struct adapter *adap, int port, bool verbose)
 {
 	static const struct intr_details mac_intr_details[] = {
 		{ F_TXFIFO_PRTY_ERR, "MAC Tx FIFO parity error" },
 		{ F_RXFIFO_PRTY_ERR, "MAC Rx FIFO parity error" },
 		{ 0 }
 	};
 	char name[32];
 	struct intr_info ii;
 	bool fatal = false;
 
 	if (is_t4(adap)) {
 		snprintf(name, sizeof(name), "XGMAC_PORT%u_INT_CAUSE", port);
 		ii.name = &name[0];
 		ii.cause_reg = PORT_REG(port, A_XGMAC_PORT_INT_CAUSE);
 		ii.enable_reg = PORT_REG(port, A_XGMAC_PORT_INT_EN);
 		ii.fatal = F_TXFIFO_PRTY_ERR | F_RXFIFO_PRTY_ERR,
 		ii.details = mac_intr_details,
 		ii.actions = NULL;
 	} else {
 		snprintf(name, sizeof(name), "MAC_PORT%u_INT_CAUSE", port);
 		ii.name = &name[0];
 		ii.cause_reg = T5_PORT_REG(port, A_MAC_PORT_INT_CAUSE);
 		ii.enable_reg = T5_PORT_REG(port, A_MAC_PORT_INT_EN);
 		ii.fatal = F_TXFIFO_PRTY_ERR | F_RXFIFO_PRTY_ERR,
 		ii.details = mac_intr_details,
 		ii.actions = NULL;
 	}
 	fatal |= t4_handle_intr(adap, &ii, 0, verbose);
 
 	if (chip_id(adap) >= CHELSIO_T5) {
 		snprintf(name, sizeof(name), "MAC_PORT%u_PERR_INT_CAUSE", port);
 		ii.name = &name[0];
 		ii.cause_reg = T5_PORT_REG(port, A_MAC_PORT_PERR_INT_CAUSE);
 		ii.enable_reg = T5_PORT_REG(port, A_MAC_PORT_PERR_INT_EN);
 		ii.fatal = 0;
 		ii.details = NULL;
 		ii.actions = NULL;
 		fatal |= t4_handle_intr(adap, &ii, 0, verbose);
 	}
 
 	if (chip_id(adap) >= CHELSIO_T6) {
 		snprintf(name, sizeof(name), "MAC_PORT%u_PERR_INT_CAUSE_100G", port);
 		ii.name = &name[0];
 		ii.cause_reg = T5_PORT_REG(port, A_MAC_PORT_PERR_INT_CAUSE_100G);
 		ii.enable_reg = T5_PORT_REG(port, A_MAC_PORT_PERR_INT_EN_100G);
 		ii.fatal = 0;
 		ii.details = NULL;
 		ii.actions = NULL;
 		fatal |= t4_handle_intr(adap, &ii, 0, verbose);
 	}
 
 	return (fatal);
 }
 
 static bool plpl_intr_handler(struct adapter *adap, int arg, bool verbose)
 {
 	static const struct intr_details plpl_intr_details[] = {
 		{ F_FATALPERR, "Fatal parity error" },
 		{ F_PERRVFID, "VFID_MAP parity error" },
 		{ 0 }
 	};
 	struct intr_info plpl_intr_info = {
 		.name = "PL_PL_INT_CAUSE",
 		.cause_reg = A_PL_PL_INT_CAUSE,
 		.enable_reg = A_PL_PL_INT_ENABLE,
 		.fatal = F_FATALPERR,
 		.details = plpl_intr_details,
 		.actions = NULL,
 	};
 
 	if (is_t4(adap))
 		plpl_intr_info.fatal |= F_PERRVFID;
 
 	return (t4_handle_intr(adap, &plpl_intr_info, 0, verbose));
 }
 
 /**
  *	t4_slow_intr_handler - control path interrupt handler
  *	@adap: the adapter
  *	@verbose: increased verbosity, for debug
  *
  *	T4 interrupt handler for non-data global interrupt events, e.g., errors.
  *	The designation 'slow' is because it involves register reads, while
  *	data interrupts typically don't involve any MMIOs.
  */
 int t4_slow_intr_handler(struct adapter *adap, bool verbose)
 {
 	static const struct intr_details pl_intr_details[] = {
 		{ F_MC1, "MC1" },
 		{ F_UART, "UART" },
 		{ F_ULP_TX, "ULP TX" },
 		{ F_SGE, "SGE" },
 		{ F_HMA, "HMA" },
 		{ F_CPL_SWITCH, "CPL Switch" },
 		{ F_ULP_RX, "ULP RX" },
 		{ F_PM_RX, "PM RX" },
 		{ F_PM_TX, "PM TX" },
 		{ F_MA, "MA" },
 		{ F_TP, "TP" },
 		{ F_LE, "LE" },
 		{ F_EDC1, "EDC1" },
 		{ F_EDC0, "EDC0" },
 		{ F_MC, "MC0" },
 		{ F_PCIE, "PCIE" },
 		{ F_PMU, "PMU" },
 		{ F_MAC3, "MAC3" },
 		{ F_MAC2, "MAC2" },
 		{ F_MAC1, "MAC1" },
 		{ F_MAC0, "MAC0" },
 		{ F_SMB, "SMB" },
 		{ F_SF, "SF" },
 		{ F_PL, "PL" },
 		{ F_NCSI, "NC-SI" },
 		{ F_MPS, "MPS" },
 		{ F_MI, "MI" },
 		{ F_DBG, "DBG" },
 		{ F_I2CM, "I2CM" },
 		{ F_CIM, "CIM" },
 		{ 0 }
 	};
 	static const struct intr_info pl_perr_cause = {
 		.name = "PL_PERR_CAUSE",
 		.cause_reg = A_PL_PERR_CAUSE,
 		.enable_reg = A_PL_PERR_ENABLE,
 		.fatal = 0xffffffff,
 		.details = pl_intr_details,
 		.actions = NULL,
 	};
 	static const struct intr_action pl_intr_action[] = {
 		{ F_MC1, MEM_MC1, mem_intr_handler },
 		{ F_ULP_TX, -1, ulptx_intr_handler },
 		{ F_SGE, -1, sge_intr_handler },
 		{ F_CPL_SWITCH, -1, cplsw_intr_handler },
 		{ F_ULP_RX, -1, ulprx_intr_handler },
 		{ F_PM_RX, -1, pmrx_intr_handler},
 		{ F_PM_TX, -1, pmtx_intr_handler},
 		{ F_MA, -1, ma_intr_handler },
 		{ F_TP, -1, tp_intr_handler },
 		{ F_LE, -1, le_intr_handler },
 		{ F_EDC1, MEM_EDC1, mem_intr_handler },
 		{ F_EDC0, MEM_EDC0, mem_intr_handler },
 		{ F_MC0, MEM_MC0, mem_intr_handler },
 		{ F_PCIE, -1, pcie_intr_handler },
 		{ F_MAC3, 3, mac_intr_handler},
 		{ F_MAC2, 2, mac_intr_handler},
 		{ F_MAC1, 1, mac_intr_handler},
 		{ F_MAC0, 0, mac_intr_handler},
 		{ F_SMB, -1, smb_intr_handler},
 		{ F_PL, -1, plpl_intr_handler },
 		{ F_NCSI, -1, ncsi_intr_handler},
 		{ F_MPS, -1, mps_intr_handler },
 		{ F_CIM, -1, cim_intr_handler },
 		{ 0 }
 	};
 	static const struct intr_info pl_intr_info = {
 		.name = "PL_INT_CAUSE",
 		.cause_reg = A_PL_INT_CAUSE,
 		.enable_reg = A_PL_INT_ENABLE,
 		.fatal = 0,
 		.details = pl_intr_details,
 		.actions = pl_intr_action,
 	};
 	bool fatal;
 	u32 perr;
 
 	perr = t4_read_reg(adap, pl_perr_cause.cause_reg);
 	if (verbose || perr != 0) {
 		t4_show_intr_info(adap, &pl_perr_cause, perr);
 		if (perr != 0)
 			t4_write_reg(adap, pl_perr_cause.cause_reg, perr);
 		if (verbose)
 			perr |= t4_read_reg(adap, pl_intr_info.enable_reg);
 	}
 	fatal = t4_handle_intr(adap, &pl_intr_info, perr, verbose);
 	if (fatal)
 		t4_fatal_err(adap, false);
 
 	return (0);
 }
 
 #define PF_INTR_MASK (F_PFSW | F_PFCIM)
 
 /**
  *	t4_intr_enable - enable interrupts
  *	@adapter: the adapter whose interrupts should be enabled
  *
  *	Enable PF-specific interrupts for the calling function and the top-level
  *	interrupt concentrator for global interrupts.  Interrupts are already
  *	enabled at each module,	here we just enable the roots of the interrupt
  *	hierarchies.
  *
  *	Note: this function should be called only when the driver manages
  *	non PF-specific interrupts from the various HW modules.  Only one PCI
  *	function at a time should be doing this.
  */
 void t4_intr_enable(struct adapter *adap)
 {
 	u32 val = 0;
 
 	if (chip_id(adap) <= CHELSIO_T5)
 		val = F_ERR_DROPPED_DB | F_ERR_EGR_CTXT_PRIO | F_DBFIFO_HP_INT;
 	else
 		val = F_ERR_PCIE_ERROR0 | F_ERR_PCIE_ERROR1 | F_FATAL_WRE_LEN;
 	val |= F_ERR_CPL_EXCEED_IQE_SIZE | F_ERR_INVALID_CIDX_INC |
 	    F_ERR_CPL_OPCODE_0 | F_ERR_DATA_CPL_ON_HIGH_QID1 |
 	    F_INGRESS_SIZE_ERR | F_ERR_DATA_CPL_ON_HIGH_QID0 |
 	    F_ERR_BAD_DB_PIDX3 | F_ERR_BAD_DB_PIDX2 | F_ERR_BAD_DB_PIDX1 |
 	    F_ERR_BAD_DB_PIDX0 | F_ERR_ING_CTXT_PRIO | F_DBFIFO_LP_INT |
 	    F_EGRESS_SIZE_ERR;
 	t4_set_reg_field(adap, A_SGE_INT_ENABLE3, val, val);
 	t4_write_reg(adap, MYPF_REG(A_PL_PF_INT_ENABLE), PF_INTR_MASK);
 	t4_set_reg_field(adap, A_PL_INT_ENABLE, F_SF | F_I2CM, 0);
 	t4_set_reg_field(adap, A_PL_INT_MAP0, 0, 1 << adap->pf);
 }
 
 /**
  *	t4_intr_disable - disable interrupts
  *	@adap: the adapter whose interrupts should be disabled
  *
  *	Disable interrupts.  We only disable the top-level interrupt
  *	concentrators.  The caller must be a PCI function managing global
  *	interrupts.
  */
 void t4_intr_disable(struct adapter *adap)
 {
 
 	t4_write_reg(adap, MYPF_REG(A_PL_PF_INT_ENABLE), 0);
 	t4_set_reg_field(adap, A_PL_INT_MAP0, 1 << adap->pf, 0);
 }
 
 /**
  *	t4_intr_clear - clear all interrupts
  *	@adap: the adapter whose interrupts should be cleared
  *
  *	Clears all interrupts.  The caller must be a PCI function managing
  *	global interrupts.
  */
 void t4_intr_clear(struct adapter *adap)
 {
 	static const u32 cause_reg[] = {
 		A_CIM_HOST_INT_CAUSE,
 		A_CIM_HOST_UPACC_INT_CAUSE,
 		MYPF_REG(A_CIM_PF_HOST_INT_CAUSE),
 		A_CPL_INTR_CAUSE,
 		EDC_REG(A_EDC_INT_CAUSE, 0), EDC_REG(A_EDC_INT_CAUSE, 1),
 		A_LE_DB_INT_CAUSE,
 		A_MA_INT_WRAP_STATUS,
 		A_MA_PARITY_ERROR_STATUS1,
 		A_MA_INT_CAUSE,
 		A_MPS_CLS_INT_CAUSE,
 		A_MPS_RX_PERR_INT_CAUSE,
 		A_MPS_STAT_PERR_INT_CAUSE_RX_FIFO,
 		A_MPS_STAT_PERR_INT_CAUSE_SRAM,
 		A_MPS_TRC_INT_CAUSE,
 		A_MPS_TX_INT_CAUSE,
 		A_MPS_STAT_PERR_INT_CAUSE_TX_FIFO,
 		A_NCSI_INT_CAUSE,
 		A_PCIE_INT_CAUSE,
 		A_PCIE_NONFAT_ERR,
 		A_PL_PL_INT_CAUSE,
 		A_PM_RX_INT_CAUSE,
 		A_PM_TX_INT_CAUSE,
 		A_SGE_INT_CAUSE1,
 		A_SGE_INT_CAUSE2,
 		A_SGE_INT_CAUSE3,
 		A_SGE_INT_CAUSE4,
 		A_SMB_INT_CAUSE,
 		A_TP_INT_CAUSE,
 		A_ULP_RX_INT_CAUSE,
 		A_ULP_RX_INT_CAUSE_2,
 		A_ULP_TX_INT_CAUSE,
 		A_ULP_TX_INT_CAUSE_2,
 
 		MYPF_REG(A_PL_PF_INT_CAUSE),
 	};
 	int i;
 	const int nchan = adap->chip_params->nchan;
 
 	for (i = 0; i < ARRAY_SIZE(cause_reg); i++)
 		t4_write_reg(adap, cause_reg[i], 0xffffffff);
 
 	if (is_t4(adap)) {
 		t4_write_reg(adap, A_PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
 		    0xffffffff);
 		t4_write_reg(adap, A_PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
 		    0xffffffff);
 		t4_write_reg(adap, A_MC_INT_CAUSE, 0xffffffff);
 		for (i = 0; i < nchan; i++) {
 			t4_write_reg(adap, PORT_REG(i, A_XGMAC_PORT_INT_CAUSE),
 			    0xffffffff);
 		}
 	}
 	if (chip_id(adap) >= CHELSIO_T5) {
 		t4_write_reg(adap, A_MA_PARITY_ERROR_STATUS2, 0xffffffff);
 		t4_write_reg(adap, A_MPS_STAT_PERR_INT_CAUSE_SRAM1, 0xffffffff);
 		t4_write_reg(adap, A_SGE_INT_CAUSE5, 0xffffffff);
 		t4_write_reg(adap, A_MC_P_INT_CAUSE, 0xffffffff);
 		if (is_t5(adap)) {
 			t4_write_reg(adap, MC_REG(A_MC_P_INT_CAUSE, 1),
 			    0xffffffff);
 		}
 		for (i = 0; i < nchan; i++) {
 			t4_write_reg(adap, T5_PORT_REG(i,
 			    A_MAC_PORT_PERR_INT_CAUSE), 0xffffffff);
 			if (chip_id(adap) > CHELSIO_T5) {
 				t4_write_reg(adap, T5_PORT_REG(i,
 				    A_MAC_PORT_PERR_INT_CAUSE_100G),
 				    0xffffffff);
 			}
 			t4_write_reg(adap, T5_PORT_REG(i, A_MAC_PORT_INT_CAUSE),
 			    0xffffffff);
 		}
 	}
 	if (chip_id(adap) >= CHELSIO_T6) {
 		t4_write_reg(adap, A_SGE_INT_CAUSE6, 0xffffffff);
 	}
 
 	t4_write_reg(adap, A_MPS_INT_CAUSE, is_t4(adap) ? 0 : 0xffffffff);
 	t4_write_reg(adap, A_PL_PERR_CAUSE, 0xffffffff);
 	t4_write_reg(adap, A_PL_INT_CAUSE, 0xffffffff);
 	(void) t4_read_reg(adap, A_PL_INT_CAUSE);          /* flush */
 }
 
 /**
  *	hash_mac_addr - return the hash value of a MAC address
  *	@addr: the 48-bit Ethernet MAC address
  *
  *	Hashes a MAC address according to the hash function used by HW inexact
  *	(hash) address matching.
  */
 static int hash_mac_addr(const u8 *addr)
 {
 	u32 a = ((u32)addr[0] << 16) | ((u32)addr[1] << 8) | addr[2];
 	u32 b = ((u32)addr[3] << 16) | ((u32)addr[4] << 8) | addr[5];
 	a ^= b;
 	a ^= (a >> 12);
 	a ^= (a >> 6);
 	return a & 0x3f;
 }
 
 /**
  *	t4_config_rss_range - configure a portion of the RSS mapping table
  *	@adapter: the adapter
  *	@mbox: mbox to use for the FW command
  *	@viid: virtual interface whose RSS subtable is to be written
  *	@start: start entry in the table to write
  *	@n: how many table entries to write
  *	@rspq: values for the "response queue" (Ingress Queue) lookup table
  *	@nrspq: number of values in @rspq
  *
  *	Programs the selected part of the VI's RSS mapping table with the
  *	provided values.  If @nrspq < @n the supplied values are used repeatedly
  *	until the full table range is populated.
  *
  *	The caller must ensure the values in @rspq are in the range allowed for
  *	@viid.
  */
 int t4_config_rss_range(struct adapter *adapter, int mbox, unsigned int viid,
 			int start, int n, const u16 *rspq, unsigned int nrspq)
 {
 	int ret;
 	const u16 *rsp = rspq;
 	const u16 *rsp_end = rspq + nrspq;
 	struct fw_rss_ind_tbl_cmd cmd;
 
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.op_to_viid = cpu_to_be32(V_FW_CMD_OP(FW_RSS_IND_TBL_CMD) |
 				     F_FW_CMD_REQUEST | F_FW_CMD_WRITE |
 				     V_FW_RSS_IND_TBL_CMD_VIID(viid));
 	cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
 
 	/*
 	 * Each firmware RSS command can accommodate up to 32 RSS Ingress
 	 * Queue Identifiers.  These Ingress Queue IDs are packed three to
 	 * a 32-bit word as 10-bit values with the upper remaining 2 bits
 	 * reserved.
 	 */
 	while (n > 0) {
 		int nq = min(n, 32);
 		int nq_packed = 0;
 		__be32 *qp = &cmd.iq0_to_iq2;
 
 		/*
 		 * Set up the firmware RSS command header to send the next
 		 * "nq" Ingress Queue IDs to the firmware.
 		 */
 		cmd.niqid = cpu_to_be16(nq);
 		cmd.startidx = cpu_to_be16(start);
 
 		/*
 		 * "nq" more done for the start of the next loop.
 		 */
 		start += nq;
 		n -= nq;
 
 		/*
 		 * While there are still Ingress Queue IDs to stuff into the
 		 * current firmware RSS command, retrieve them from the
 		 * Ingress Queue ID array and insert them into the command.
 		 */
 		while (nq > 0) {
 			/*
 			 * Grab up to the next 3 Ingress Queue IDs (wrapping
 			 * around the Ingress Queue ID array if necessary) and
 			 * insert them into the firmware RSS command at the
 			 * current 3-tuple position within the commad.
 			 */
 			u16 qbuf[3];
 			u16 *qbp = qbuf;
 			int nqbuf = min(3, nq);
 
 			nq -= nqbuf;
 			qbuf[0] = qbuf[1] = qbuf[2] = 0;
 			while (nqbuf && nq_packed < 32) {
 				nqbuf--;
 				nq_packed++;
 				*qbp++ = *rsp++;
 				if (rsp >= rsp_end)
 					rsp = rspq;
 			}
 			*qp++ = cpu_to_be32(V_FW_RSS_IND_TBL_CMD_IQ0(qbuf[0]) |
 					    V_FW_RSS_IND_TBL_CMD_IQ1(qbuf[1]) |
 					    V_FW_RSS_IND_TBL_CMD_IQ2(qbuf[2]));
 		}
 
 		/*
 		 * Send this portion of the RRS table update to the firmware;
 		 * bail out on any errors.
 		 */
 		ret = t4_wr_mbox(adapter, mbox, &cmd, sizeof(cmd), NULL);
 		if (ret)
 			return ret;
 	}
 	return 0;
 }
 
 /**
  *	t4_config_glbl_rss - configure the global RSS mode
  *	@adapter: the adapter
  *	@mbox: mbox to use for the FW command
  *	@mode: global RSS mode
  *	@flags: mode-specific flags
  *
  *	Sets the global RSS mode.
  */
 int t4_config_glbl_rss(struct adapter *adapter, int mbox, unsigned int mode,
 		       unsigned int flags)
 {
 	struct fw_rss_glb_config_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_RSS_GLB_CONFIG_CMD) |
 				    F_FW_CMD_REQUEST | F_FW_CMD_WRITE);
 	c.retval_len16 = cpu_to_be32(FW_LEN16(c));
 	if (mode == FW_RSS_GLB_CONFIG_CMD_MODE_MANUAL) {
 		c.u.manual.mode_pkd =
 			cpu_to_be32(V_FW_RSS_GLB_CONFIG_CMD_MODE(mode));
 	} else if (mode == FW_RSS_GLB_CONFIG_CMD_MODE_BASICVIRTUAL) {
 		c.u.basicvirtual.mode_keymode =
 			cpu_to_be32(V_FW_RSS_GLB_CONFIG_CMD_MODE(mode));
 		c.u.basicvirtual.synmapen_to_hashtoeplitz = cpu_to_be32(flags);
 	} else
 		return -EINVAL;
 	return t4_wr_mbox(adapter, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_config_vi_rss - configure per VI RSS settings
  *	@adapter: the adapter
  *	@mbox: mbox to use for the FW command
  *	@viid: the VI id
  *	@flags: RSS flags
  *	@defq: id of the default RSS queue for the VI.
  *	@skeyidx: RSS secret key table index for non-global mode
  *	@skey: RSS vf_scramble key for VI.
  *
  *	Configures VI-specific RSS properties.
  */
 int t4_config_vi_rss(struct adapter *adapter, int mbox, unsigned int viid,
 		     unsigned int flags, unsigned int defq, unsigned int skeyidx,
 		     unsigned int skey)
 {
 	struct fw_rss_vi_config_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_viid = cpu_to_be32(V_FW_CMD_OP(FW_RSS_VI_CONFIG_CMD) |
 				   F_FW_CMD_REQUEST | F_FW_CMD_WRITE |
 				   V_FW_RSS_VI_CONFIG_CMD_VIID(viid));
 	c.retval_len16 = cpu_to_be32(FW_LEN16(c));
 	c.u.basicvirtual.defaultq_to_udpen = cpu_to_be32(flags |
 					V_FW_RSS_VI_CONFIG_CMD_DEFAULTQ(defq));
 	c.u.basicvirtual.secretkeyidx_pkd = cpu_to_be32(
 					V_FW_RSS_VI_CONFIG_CMD_SECRETKEYIDX(skeyidx));
 	c.u.basicvirtual.secretkeyxor = cpu_to_be32(skey);
 
 	return t4_wr_mbox(adapter, mbox, &c, sizeof(c), NULL);
 }
 
 /* Read an RSS table row */
 static int rd_rss_row(struct adapter *adap, int row, u32 *val)
 {
 	t4_write_reg(adap, A_TP_RSS_LKP_TABLE, 0xfff00000 | row);
 	return t4_wait_op_done_val(adap, A_TP_RSS_LKP_TABLE, F_LKPTBLROWVLD, 1,
 				   5, 0, val);
 }
 
 /**
  *	t4_read_rss - read the contents of the RSS mapping table
  *	@adapter: the adapter
  *	@map: holds the contents of the RSS mapping table
  *
  *	Reads the contents of the RSS hash->queue mapping table.
  */
 int t4_read_rss(struct adapter *adapter, u16 *map)
 {
 	u32 val;
 	int i, ret;
 
 	for (i = 0; i < RSS_NENTRIES / 2; ++i) {
 		ret = rd_rss_row(adapter, i, &val);
 		if (ret)
 			return ret;
 		*map++ = G_LKPTBLQUEUE0(val);
 		*map++ = G_LKPTBLQUEUE1(val);
 	}
 	return 0;
 }
 
 /**
  * t4_tp_fw_ldst_rw - Access TP indirect register through LDST
  * @adap: the adapter
  * @cmd: TP fw ldst address space type
  * @vals: where the indirect register values are stored/written
  * @nregs: how many indirect registers to read/write
  * @start_idx: index of first indirect register to read/write
  * @rw: Read (1) or Write (0)
  * @sleep_ok: if true we may sleep while awaiting command completion
  *
  * Access TP indirect registers through LDST
  **/
 static int t4_tp_fw_ldst_rw(struct adapter *adap, int cmd, u32 *vals,
 			    unsigned int nregs, unsigned int start_index,
 			    unsigned int rw, bool sleep_ok)
 {
 	int ret = 0;
 	unsigned int i;
 	struct fw_ldst_cmd c;
 
 	for (i = 0; i < nregs; i++) {
 		memset(&c, 0, sizeof(c));
 		c.op_to_addrspace = cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
 						F_FW_CMD_REQUEST |
 						(rw ? F_FW_CMD_READ :
 						      F_FW_CMD_WRITE) |
 						V_FW_LDST_CMD_ADDRSPACE(cmd));
 		c.cycles_to_len16 = cpu_to_be32(FW_LEN16(c));
 
 		c.u.addrval.addr = cpu_to_be32(start_index + i);
 		c.u.addrval.val  = rw ? 0 : cpu_to_be32(vals[i]);
 		ret = t4_wr_mbox_meat(adap, adap->mbox, &c, sizeof(c), &c,
 				      sleep_ok);
 		if (ret)
 			return ret;
 
 		if (rw)
 			vals[i] = be32_to_cpu(c.u.addrval.val);
 	}
 	return 0;
 }
 
 /**
  * t4_tp_indirect_rw - Read/Write TP indirect register through LDST or backdoor
  * @adap: the adapter
  * @reg_addr: Address Register
  * @reg_data: Data register
  * @buff: where the indirect register values are stored/written
  * @nregs: how many indirect registers to read/write
  * @start_index: index of first indirect register to read/write
  * @rw: READ(1) or WRITE(0)
  * @sleep_ok: if true we may sleep while awaiting command completion
  *
  * Read/Write TP indirect registers through LDST if possible.
  * Else, use backdoor access
  **/
 static void t4_tp_indirect_rw(struct adapter *adap, u32 reg_addr, u32 reg_data,
 			      u32 *buff, u32 nregs, u32 start_index, int rw,
 			      bool sleep_ok)
 {
 	int rc = -EINVAL;
 	int cmd;
 
 	switch (reg_addr) {
 	case A_TP_PIO_ADDR:
 		cmd = FW_LDST_ADDRSPC_TP_PIO;
 		break;
 	case A_TP_TM_PIO_ADDR:
 		cmd = FW_LDST_ADDRSPC_TP_TM_PIO;
 		break;
 	case A_TP_MIB_INDEX:
 		cmd = FW_LDST_ADDRSPC_TP_MIB;
 		break;
 	default:
 		goto indirect_access;
 	}
 
 	if (t4_use_ldst(adap))
 		rc = t4_tp_fw_ldst_rw(adap, cmd, buff, nregs, start_index, rw,
 				      sleep_ok);
 
 indirect_access:
 
 	if (rc) {
 		if (rw)
 			t4_read_indirect(adap, reg_addr, reg_data, buff, nregs,
 					 start_index);
 		else
 			t4_write_indirect(adap, reg_addr, reg_data, buff, nregs,
 					  start_index);
 	}
 }
 
 /**
  * t4_tp_pio_read - Read TP PIO registers
  * @adap: the adapter
  * @buff: where the indirect register values are written
  * @nregs: how many indirect registers to read
  * @start_index: index of first indirect register to read
  * @sleep_ok: if true we may sleep while awaiting command completion
  *
  * Read TP PIO Registers
  **/
 void t4_tp_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
 		    u32 start_index, bool sleep_ok)
 {
 	t4_tp_indirect_rw(adap, A_TP_PIO_ADDR, A_TP_PIO_DATA, buff, nregs,
 			  start_index, 1, sleep_ok);
 }
 
 /**
  * t4_tp_pio_write - Write TP PIO registers
  * @adap: the adapter
  * @buff: where the indirect register values are stored
  * @nregs: how many indirect registers to write
  * @start_index: index of first indirect register to write
  * @sleep_ok: if true we may sleep while awaiting command completion
  *
  * Write TP PIO Registers
  **/
 void t4_tp_pio_write(struct adapter *adap, const u32 *buff, u32 nregs,
 		     u32 start_index, bool sleep_ok)
 {
 	t4_tp_indirect_rw(adap, A_TP_PIO_ADDR, A_TP_PIO_DATA,
 	    __DECONST(u32 *, buff), nregs, start_index, 0, sleep_ok);
 }
 
 /**
  * t4_tp_tm_pio_read - Read TP TM PIO registers
  * @adap: the adapter
  * @buff: where the indirect register values are written
  * @nregs: how many indirect registers to read
  * @start_index: index of first indirect register to read
  * @sleep_ok: if true we may sleep while awaiting command completion
  *
  * Read TP TM PIO Registers
  **/
 void t4_tp_tm_pio_read(struct adapter *adap, u32 *buff, u32 nregs,
 		       u32 start_index, bool sleep_ok)
 {
 	t4_tp_indirect_rw(adap, A_TP_TM_PIO_ADDR, A_TP_TM_PIO_DATA, buff,
 			  nregs, start_index, 1, sleep_ok);
 }
 
 /**
  * t4_tp_mib_read - Read TP MIB registers
  * @adap: the adapter
  * @buff: where the indirect register values are written
  * @nregs: how many indirect registers to read
  * @start_index: index of first indirect register to read
  * @sleep_ok: if true we may sleep while awaiting command completion
  *
  * Read TP MIB Registers
  **/
 void t4_tp_mib_read(struct adapter *adap, u32 *buff, u32 nregs, u32 start_index,
 		    bool sleep_ok)
 {
 	t4_tp_indirect_rw(adap, A_TP_MIB_INDEX, A_TP_MIB_DATA, buff, nregs,
 			  start_index, 1, sleep_ok);
 }
 
 /**
  *	t4_read_rss_key - read the global RSS key
  *	@adap: the adapter
  *	@key: 10-entry array holding the 320-bit RSS key
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Reads the global 320-bit RSS key.
  */
 void t4_read_rss_key(struct adapter *adap, u32 *key, bool sleep_ok)
 {
 	t4_tp_pio_read(adap, key, 10, A_TP_RSS_SECRET_KEY0, sleep_ok);
 }
 
 /**
  *	t4_write_rss_key - program one of the RSS keys
  *	@adap: the adapter
  *	@key: 10-entry array holding the 320-bit RSS key
  *	@idx: which RSS key to write
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Writes one of the RSS keys with the given 320-bit value.  If @idx is
  *	0..15 the corresponding entry in the RSS key table is written,
  *	otherwise the global RSS key is written.
  */
 void t4_write_rss_key(struct adapter *adap, const u32 *key, int idx,
 		      bool sleep_ok)
 {
 	u8 rss_key_addr_cnt = 16;
 	u32 vrt = t4_read_reg(adap, A_TP_RSS_CONFIG_VRT);
 
 	/*
 	 * T6 and later: for KeyMode 3 (per-vf and per-vf scramble),
 	 * allows access to key addresses 16-63 by using KeyWrAddrX
 	 * as index[5:4](upper 2) into key table
 	 */
 	if ((chip_id(adap) > CHELSIO_T5) &&
 	    (vrt & F_KEYEXTEND) && (G_KEYMODE(vrt) == 3))
 		rss_key_addr_cnt = 32;
 
 	t4_tp_pio_write(adap, key, 10, A_TP_RSS_SECRET_KEY0, sleep_ok);
 
 	if (idx >= 0 && idx < rss_key_addr_cnt) {
 		if (rss_key_addr_cnt > 16)
 			t4_write_reg(adap, A_TP_RSS_CONFIG_VRT,
 				     vrt | V_KEYWRADDRX(idx >> 4) |
 				     V_T6_VFWRADDR(idx) | F_KEYWREN);
 		else
 			t4_write_reg(adap, A_TP_RSS_CONFIG_VRT,
 				     vrt| V_KEYWRADDR(idx) | F_KEYWREN);
 	}
 }
 
 /**
  *	t4_read_rss_pf_config - read PF RSS Configuration Table
  *	@adapter: the adapter
  *	@index: the entry in the PF RSS table to read
  *	@valp: where to store the returned value
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Reads the PF RSS Configuration Table at the specified index and returns
  *	the value found there.
  */
 void t4_read_rss_pf_config(struct adapter *adapter, unsigned int index,
 			   u32 *valp, bool sleep_ok)
 {
 	t4_tp_pio_read(adapter, valp, 1, A_TP_RSS_PF0_CONFIG + index, sleep_ok);
 }
 
 /**
  *	t4_write_rss_pf_config - write PF RSS Configuration Table
  *	@adapter: the adapter
  *	@index: the entry in the VF RSS table to read
  *	@val: the value to store
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Writes the PF RSS Configuration Table at the specified index with the
  *	specified value.
  */
 void t4_write_rss_pf_config(struct adapter *adapter, unsigned int index,
 			    u32 val, bool sleep_ok)
 {
 	t4_tp_pio_write(adapter, &val, 1, A_TP_RSS_PF0_CONFIG + index,
 			sleep_ok);
 }
 
 /**
  *	t4_read_rss_vf_config - read VF RSS Configuration Table
  *	@adapter: the adapter
  *	@index: the entry in the VF RSS table to read
  *	@vfl: where to store the returned VFL
  *	@vfh: where to store the returned VFH
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Reads the VF RSS Configuration Table at the specified index and returns
  *	the (VFL, VFH) values found there.
  */
 void t4_read_rss_vf_config(struct adapter *adapter, unsigned int index,
 			   u32 *vfl, u32 *vfh, bool sleep_ok)
 {
 	u32 vrt, mask, data;
 
 	if (chip_id(adapter) <= CHELSIO_T5) {
 		mask = V_VFWRADDR(M_VFWRADDR);
 		data = V_VFWRADDR(index);
 	} else {
 		 mask =  V_T6_VFWRADDR(M_T6_VFWRADDR);
 		 data = V_T6_VFWRADDR(index);
 	}
 	/*
 	 * Request that the index'th VF Table values be read into VFL/VFH.
 	 */
 	vrt = t4_read_reg(adapter, A_TP_RSS_CONFIG_VRT);
 	vrt &= ~(F_VFRDRG | F_VFWREN | F_KEYWREN | mask);
 	vrt |= data | F_VFRDEN;
 	t4_write_reg(adapter, A_TP_RSS_CONFIG_VRT, vrt);
 
 	/*
 	 * Grab the VFL/VFH values ...
 	 */
 	t4_tp_pio_read(adapter, vfl, 1, A_TP_RSS_VFL_CONFIG, sleep_ok);
 	t4_tp_pio_read(adapter, vfh, 1, A_TP_RSS_VFH_CONFIG, sleep_ok);
 }
 
 /**
  *	t4_write_rss_vf_config - write VF RSS Configuration Table
  *
  *	@adapter: the adapter
  *	@index: the entry in the VF RSS table to write
  *	@vfl: the VFL to store
  *	@vfh: the VFH to store
  *
  *	Writes the VF RSS Configuration Table at the specified index with the
  *	specified (VFL, VFH) values.
  */
 void t4_write_rss_vf_config(struct adapter *adapter, unsigned int index,
 			    u32 vfl, u32 vfh, bool sleep_ok)
 {
 	u32 vrt, mask, data;
 
 	if (chip_id(adapter) <= CHELSIO_T5) {
 		mask = V_VFWRADDR(M_VFWRADDR);
 		data = V_VFWRADDR(index);
 	} else {
 		mask =  V_T6_VFWRADDR(M_T6_VFWRADDR);
 		data = V_T6_VFWRADDR(index);
 	}
 
 	/*
 	 * Load up VFL/VFH with the values to be written ...
 	 */
 	t4_tp_pio_write(adapter, &vfl, 1, A_TP_RSS_VFL_CONFIG, sleep_ok);
 	t4_tp_pio_write(adapter, &vfh, 1, A_TP_RSS_VFH_CONFIG, sleep_ok);
 
 	/*
 	 * Write the VFL/VFH into the VF Table at index'th location.
 	 */
 	vrt = t4_read_reg(adapter, A_TP_RSS_CONFIG_VRT);
 	vrt &= ~(F_VFRDRG | F_VFWREN | F_KEYWREN | mask);
 	vrt |= data | F_VFRDEN;
 	t4_write_reg(adapter, A_TP_RSS_CONFIG_VRT, vrt);
 }
 
 /**
  *	t4_read_rss_pf_map - read PF RSS Map
  *	@adapter: the adapter
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Reads the PF RSS Map register and returns its value.
  */
 u32 t4_read_rss_pf_map(struct adapter *adapter, bool sleep_ok)
 {
 	u32 pfmap;
 
 	t4_tp_pio_read(adapter, &pfmap, 1, A_TP_RSS_PF_MAP, sleep_ok);
 
 	return pfmap;
 }
 
 /**
  *	t4_write_rss_pf_map - write PF RSS Map
  *	@adapter: the adapter
  *	@pfmap: PF RSS Map value
  *
  *	Writes the specified value to the PF RSS Map register.
  */
 void t4_write_rss_pf_map(struct adapter *adapter, u32 pfmap, bool sleep_ok)
 {
 	t4_tp_pio_write(adapter, &pfmap, 1, A_TP_RSS_PF_MAP, sleep_ok);
 }
 
 /**
  *	t4_read_rss_pf_mask - read PF RSS Mask
  *	@adapter: the adapter
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Reads the PF RSS Mask register and returns its value.
  */
 u32 t4_read_rss_pf_mask(struct adapter *adapter, bool sleep_ok)
 {
 	u32 pfmask;
 
 	t4_tp_pio_read(adapter, &pfmask, 1, A_TP_RSS_PF_MSK, sleep_ok);
 
 	return pfmask;
 }
 
 /**
  *	t4_write_rss_pf_mask - write PF RSS Mask
  *	@adapter: the adapter
  *	@pfmask: PF RSS Mask value
  *
  *	Writes the specified value to the PF RSS Mask register.
  */
 void t4_write_rss_pf_mask(struct adapter *adapter, u32 pfmask, bool sleep_ok)
 {
 	t4_tp_pio_write(adapter, &pfmask, 1, A_TP_RSS_PF_MSK, sleep_ok);
 }
 
 /**
  *	t4_tp_get_tcp_stats - read TP's TCP MIB counters
  *	@adap: the adapter
  *	@v4: holds the TCP/IP counter values
  *	@v6: holds the TCP/IPv6 counter values
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Returns the values of TP's TCP/IP and TCP/IPv6 MIB counters.
  *	Either @v4 or @v6 may be %NULL to skip the corresponding stats.
  */
 void t4_tp_get_tcp_stats(struct adapter *adap, struct tp_tcp_stats *v4,
 			 struct tp_tcp_stats *v6, bool sleep_ok)
 {
 	u32 val[A_TP_MIB_TCP_RXT_SEG_LO - A_TP_MIB_TCP_OUT_RST + 1];
 
 #define STAT_IDX(x) ((A_TP_MIB_TCP_##x) - A_TP_MIB_TCP_OUT_RST)
 #define STAT(x)     val[STAT_IDX(x)]
 #define STAT64(x)   (((u64)STAT(x##_HI) << 32) | STAT(x##_LO))
 
 	if (v4) {
 		t4_tp_mib_read(adap, val, ARRAY_SIZE(val),
 			       A_TP_MIB_TCP_OUT_RST, sleep_ok);
 		v4->tcp_out_rsts = STAT(OUT_RST);
 		v4->tcp_in_segs  = STAT64(IN_SEG);
 		v4->tcp_out_segs = STAT64(OUT_SEG);
 		v4->tcp_retrans_segs = STAT64(RXT_SEG);
 	}
 	if (v6) {
 		t4_tp_mib_read(adap, val, ARRAY_SIZE(val),
 			       A_TP_MIB_TCP_V6OUT_RST, sleep_ok);
 		v6->tcp_out_rsts = STAT(OUT_RST);
 		v6->tcp_in_segs  = STAT64(IN_SEG);
 		v6->tcp_out_segs = STAT64(OUT_SEG);
 		v6->tcp_retrans_segs = STAT64(RXT_SEG);
 	}
 #undef STAT64
 #undef STAT
 #undef STAT_IDX
 }
 
 /**
  *	t4_tp_get_err_stats - read TP's error MIB counters
  *	@adap: the adapter
  *	@st: holds the counter values
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Returns the values of TP's error counters.
  */
 void t4_tp_get_err_stats(struct adapter *adap, struct tp_err_stats *st,
 			 bool sleep_ok)
 {
 	int nchan = adap->chip_params->nchan;
 
 	t4_tp_mib_read(adap, st->mac_in_errs, nchan, A_TP_MIB_MAC_IN_ERR_0,
 		       sleep_ok);
 
 	t4_tp_mib_read(adap, st->hdr_in_errs, nchan, A_TP_MIB_HDR_IN_ERR_0,
 		       sleep_ok);
 
 	t4_tp_mib_read(adap, st->tcp_in_errs, nchan, A_TP_MIB_TCP_IN_ERR_0,
 		       sleep_ok);
 
 	t4_tp_mib_read(adap, st->tnl_cong_drops, nchan,
 		       A_TP_MIB_TNL_CNG_DROP_0, sleep_ok);
 
 	t4_tp_mib_read(adap, st->ofld_chan_drops, nchan,
 		       A_TP_MIB_OFD_CHN_DROP_0, sleep_ok);
 
 	t4_tp_mib_read(adap, st->tnl_tx_drops, nchan, A_TP_MIB_TNL_DROP_0,
 		       sleep_ok);
 
 	t4_tp_mib_read(adap, st->ofld_vlan_drops, nchan,
 		       A_TP_MIB_OFD_VLN_DROP_0, sleep_ok);
 
 	t4_tp_mib_read(adap, st->tcp6_in_errs, nchan,
 		       A_TP_MIB_TCP_V6IN_ERR_0, sleep_ok);
 
 	t4_tp_mib_read(adap, &st->ofld_no_neigh, 2, A_TP_MIB_OFD_ARP_DROP,
 		       sleep_ok);
 }
 
 /**
  *	t4_tp_get_proxy_stats - read TP's proxy MIB counters
  *	@adap: the adapter
  *	@st: holds the counter values
  *
  *	Returns the values of TP's proxy counters.
  */
 void t4_tp_get_proxy_stats(struct adapter *adap, struct tp_proxy_stats *st,
     bool sleep_ok)
 {
 	int nchan = adap->chip_params->nchan;
 
 	t4_tp_mib_read(adap, st->proxy, nchan, A_TP_MIB_TNL_LPBK_0, sleep_ok);
 }
 
 /**
  *	t4_tp_get_cpl_stats - read TP's CPL MIB counters
  *	@adap: the adapter
  *	@st: holds the counter values
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Returns the values of TP's CPL counters.
  */
 void t4_tp_get_cpl_stats(struct adapter *adap, struct tp_cpl_stats *st,
 			 bool sleep_ok)
 {
 	int nchan = adap->chip_params->nchan;
 
 	t4_tp_mib_read(adap, st->req, nchan, A_TP_MIB_CPL_IN_REQ_0, sleep_ok);
 
 	t4_tp_mib_read(adap, st->rsp, nchan, A_TP_MIB_CPL_OUT_RSP_0, sleep_ok);
 }
 
 /**
  *	t4_tp_get_rdma_stats - read TP's RDMA MIB counters
  *	@adap: the adapter
  *	@st: holds the counter values
  *
  *	Returns the values of TP's RDMA counters.
  */
 void t4_tp_get_rdma_stats(struct adapter *adap, struct tp_rdma_stats *st,
 			  bool sleep_ok)
 {
 	t4_tp_mib_read(adap, &st->rqe_dfr_pkt, 2, A_TP_MIB_RQE_DFR_PKT,
 		       sleep_ok);
 }
 
 /**
  *	t4_get_fcoe_stats - read TP's FCoE MIB counters for a port
  *	@adap: the adapter
  *	@idx: the port index
  *	@st: holds the counter values
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Returns the values of TP's FCoE counters for the selected port.
  */
 void t4_get_fcoe_stats(struct adapter *adap, unsigned int idx,
 		       struct tp_fcoe_stats *st, bool sleep_ok)
 {
 	u32 val[2];
 
 	t4_tp_mib_read(adap, &st->frames_ddp, 1, A_TP_MIB_FCOE_DDP_0 + idx,
 		       sleep_ok);
 
 	t4_tp_mib_read(adap, &st->frames_drop, 1,
 		       A_TP_MIB_FCOE_DROP_0 + idx, sleep_ok);
 
 	t4_tp_mib_read(adap, val, 2, A_TP_MIB_FCOE_BYTE_0_HI + 2 * idx,
 		       sleep_ok);
 
 	st->octets_ddp = ((u64)val[0] << 32) | val[1];
 }
 
 /**
  *	t4_get_usm_stats - read TP's non-TCP DDP MIB counters
  *	@adap: the adapter
  *	@st: holds the counter values
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Returns the values of TP's counters for non-TCP directly-placed packets.
  */
 void t4_get_usm_stats(struct adapter *adap, struct tp_usm_stats *st,
 		      bool sleep_ok)
 {
 	u32 val[4];
 
 	t4_tp_mib_read(adap, val, 4, A_TP_MIB_USM_PKTS, sleep_ok);
 
 	st->frames = val[0];
 	st->drops = val[1];
 	st->octets = ((u64)val[2] << 32) | val[3];
 }
 
 /**
  *	t4_read_mtu_tbl - returns the values in the HW path MTU table
  *	@adap: the adapter
  *	@mtus: where to store the MTU values
  *	@mtu_log: where to store the MTU base-2 log (may be %NULL)
  *
  *	Reads the HW path MTU table.
  */
 void t4_read_mtu_tbl(struct adapter *adap, u16 *mtus, u8 *mtu_log)
 {
 	u32 v;
 	int i;
 
 	for (i = 0; i < NMTUS; ++i) {
 		t4_write_reg(adap, A_TP_MTU_TABLE,
 			     V_MTUINDEX(0xff) | V_MTUVALUE(i));
 		v = t4_read_reg(adap, A_TP_MTU_TABLE);
 		mtus[i] = G_MTUVALUE(v);
 		if (mtu_log)
 			mtu_log[i] = G_MTUWIDTH(v);
 	}
 }
 
 /**
  *	t4_read_cong_tbl - reads the congestion control table
  *	@adap: the adapter
  *	@incr: where to store the alpha values
  *
  *	Reads the additive increments programmed into the HW congestion
  *	control table.
  */
 void t4_read_cong_tbl(struct adapter *adap, u16 incr[NMTUS][NCCTRL_WIN])
 {
 	unsigned int mtu, w;
 
 	for (mtu = 0; mtu < NMTUS; ++mtu)
 		for (w = 0; w < NCCTRL_WIN; ++w) {
 			t4_write_reg(adap, A_TP_CCTRL_TABLE,
 				     V_ROWINDEX(0xffff) | (mtu << 5) | w);
 			incr[mtu][w] = (u16)t4_read_reg(adap,
 						A_TP_CCTRL_TABLE) & 0x1fff;
 		}
 }
 
 /**
  *	t4_tp_wr_bits_indirect - set/clear bits in an indirect TP register
  *	@adap: the adapter
  *	@addr: the indirect TP register address
  *	@mask: specifies the field within the register to modify
  *	@val: new value for the field
  *
  *	Sets a field of an indirect TP register to the given value.
  */
 void t4_tp_wr_bits_indirect(struct adapter *adap, unsigned int addr,
 			    unsigned int mask, unsigned int val)
 {
 	t4_write_reg(adap, A_TP_PIO_ADDR, addr);
 	val |= t4_read_reg(adap, A_TP_PIO_DATA) & ~mask;
 	t4_write_reg(adap, A_TP_PIO_DATA, val);
 }
 
 /**
  *	init_cong_ctrl - initialize congestion control parameters
  *	@a: the alpha values for congestion control
  *	@b: the beta values for congestion control
  *
  *	Initialize the congestion control parameters.
  */
 static void init_cong_ctrl(unsigned short *a, unsigned short *b)
 {
 	a[0] = a[1] = a[2] = a[3] = a[4] = a[5] = a[6] = a[7] = a[8] = 1;
 	a[9] = 2;
 	a[10] = 3;
 	a[11] = 4;
 	a[12] = 5;
 	a[13] = 6;
 	a[14] = 7;
 	a[15] = 8;
 	a[16] = 9;
 	a[17] = 10;
 	a[18] = 14;
 	a[19] = 17;
 	a[20] = 21;
 	a[21] = 25;
 	a[22] = 30;
 	a[23] = 35;
 	a[24] = 45;
 	a[25] = 60;
 	a[26] = 80;
 	a[27] = 100;
 	a[28] = 200;
 	a[29] = 300;
 	a[30] = 400;
 	a[31] = 500;
 
 	b[0] = b[1] = b[2] = b[3] = b[4] = b[5] = b[6] = b[7] = b[8] = 0;
 	b[9] = b[10] = 1;
 	b[11] = b[12] = 2;
 	b[13] = b[14] = b[15] = b[16] = 3;
 	b[17] = b[18] = b[19] = b[20] = b[21] = 4;
 	b[22] = b[23] = b[24] = b[25] = b[26] = b[27] = 5;
 	b[28] = b[29] = 6;
 	b[30] = b[31] = 7;
 }
 
 /* The minimum additive increment value for the congestion control table */
 #define CC_MIN_INCR 2U
 
 /**
  *	t4_load_mtus - write the MTU and congestion control HW tables
  *	@adap: the adapter
  *	@mtus: the values for the MTU table
  *	@alpha: the values for the congestion control alpha parameter
  *	@beta: the values for the congestion control beta parameter
  *
  *	Write the HW MTU table with the supplied MTUs and the high-speed
  *	congestion control table with the supplied alpha, beta, and MTUs.
  *	We write the two tables together because the additive increments
  *	depend on the MTUs.
  */
 void t4_load_mtus(struct adapter *adap, const unsigned short *mtus,
 		  const unsigned short *alpha, const unsigned short *beta)
 {
 	static const unsigned int avg_pkts[NCCTRL_WIN] = {
 		2, 6, 10, 14, 20, 28, 40, 56, 80, 112, 160, 224, 320, 448, 640,
 		896, 1281, 1792, 2560, 3584, 5120, 7168, 10240, 14336, 20480,
 		28672, 40960, 57344, 81920, 114688, 163840, 229376
 	};
 
 	unsigned int i, w;
 
 	for (i = 0; i < NMTUS; ++i) {
 		unsigned int mtu = mtus[i];
 		unsigned int log2 = fls(mtu);
 
 		if (!(mtu & ((1 << log2) >> 2)))     /* round */
 			log2--;
 		t4_write_reg(adap, A_TP_MTU_TABLE, V_MTUINDEX(i) |
 			     V_MTUWIDTH(log2) | V_MTUVALUE(mtu));
 
 		for (w = 0; w < NCCTRL_WIN; ++w) {
 			unsigned int inc;
 
 			inc = max(((mtu - 40) * alpha[w]) / avg_pkts[w],
 				  CC_MIN_INCR);
 
 			t4_write_reg(adap, A_TP_CCTRL_TABLE, (i << 21) |
 				     (w << 16) | (beta[w] << 13) | inc);
 		}
 	}
 }
 
 /**
  *	t4_set_pace_tbl - set the pace table
  *	@adap: the adapter
  *	@pace_vals: the pace values in microseconds
  *	@start: index of the first entry in the HW pace table to set
  *	@n: how many entries to set
  *
  *	Sets (a subset of the) HW pace table.
  */
 int t4_set_pace_tbl(struct adapter *adap, const unsigned int *pace_vals,
 		     unsigned int start, unsigned int n)
 {
 	unsigned int vals[NTX_SCHED], i;
 	unsigned int tick_ns = dack_ticks_to_usec(adap, 1000);
 
 	if (n > NTX_SCHED)
 	    return -ERANGE;
 
 	/* convert values from us to dack ticks, rounding to closest value */
 	for (i = 0; i < n; i++, pace_vals++) {
 		vals[i] = (1000 * *pace_vals + tick_ns / 2) / tick_ns;
 		if (vals[i] > 0x7ff)
 			return -ERANGE;
 		if (*pace_vals && vals[i] == 0)
 			return -ERANGE;
 	}
 	for (i = 0; i < n; i++, start++)
 		t4_write_reg(adap, A_TP_PACE_TABLE, (start << 16) | vals[i]);
 	return 0;
 }
 
 /**
  *	t4_set_sched_bps - set the bit rate for a HW traffic scheduler
  *	@adap: the adapter
  *	@kbps: target rate in Kbps
  *	@sched: the scheduler index
  *
  *	Configure a Tx HW scheduler for the target rate.
  */
 int t4_set_sched_bps(struct adapter *adap, int sched, unsigned int kbps)
 {
 	unsigned int v, tps, cpt, bpt, delta, mindelta = ~0;
 	unsigned int clk = adap->params.vpd.cclk * 1000;
 	unsigned int selected_cpt = 0, selected_bpt = 0;
 
 	if (kbps > 0) {
 		kbps *= 125;     /* -> bytes */
 		for (cpt = 1; cpt <= 255; cpt++) {
 			tps = clk / cpt;
 			bpt = (kbps + tps / 2) / tps;
 			if (bpt > 0 && bpt <= 255) {
 				v = bpt * tps;
 				delta = v >= kbps ? v - kbps : kbps - v;
 				if (delta < mindelta) {
 					mindelta = delta;
 					selected_cpt = cpt;
 					selected_bpt = bpt;
 				}
 			} else if (selected_cpt)
 				break;
 		}
 		if (!selected_cpt)
 			return -EINVAL;
 	}
 	t4_write_reg(adap, A_TP_TM_PIO_ADDR,
 		     A_TP_TX_MOD_Q1_Q0_RATE_LIMIT - sched / 2);
 	v = t4_read_reg(adap, A_TP_TM_PIO_DATA);
 	if (sched & 1)
 		v = (v & 0xffff) | (selected_cpt << 16) | (selected_bpt << 24);
 	else
 		v = (v & 0xffff0000) | selected_cpt | (selected_bpt << 8);
 	t4_write_reg(adap, A_TP_TM_PIO_DATA, v);
 	return 0;
 }
 
 /**
  *	t4_set_sched_ipg - set the IPG for a Tx HW packet rate scheduler
  *	@adap: the adapter
  *	@sched: the scheduler index
  *	@ipg: the interpacket delay in tenths of nanoseconds
  *
  *	Set the interpacket delay for a HW packet rate scheduler.
  */
 int t4_set_sched_ipg(struct adapter *adap, int sched, unsigned int ipg)
 {
 	unsigned int v, addr = A_TP_TX_MOD_Q1_Q0_TIMER_SEPARATOR - sched / 2;
 
 	/* convert ipg to nearest number of core clocks */
 	ipg *= core_ticks_per_usec(adap);
 	ipg = (ipg + 5000) / 10000;
 	if (ipg > M_TXTIMERSEPQ0)
 		return -EINVAL;
 
 	t4_write_reg(adap, A_TP_TM_PIO_ADDR, addr);
 	v = t4_read_reg(adap, A_TP_TM_PIO_DATA);
 	if (sched & 1)
 		v = (v & V_TXTIMERSEPQ0(M_TXTIMERSEPQ0)) | V_TXTIMERSEPQ1(ipg);
 	else
 		v = (v & V_TXTIMERSEPQ1(M_TXTIMERSEPQ1)) | V_TXTIMERSEPQ0(ipg);
 	t4_write_reg(adap, A_TP_TM_PIO_DATA, v);
 	t4_read_reg(adap, A_TP_TM_PIO_DATA);
 	return 0;
 }
 
 /*
  * Calculates a rate in bytes/s given the number of 256-byte units per 4K core
  * clocks.  The formula is
  *
  * bytes/s = bytes256 * 256 * ClkFreq / 4096
  *
  * which is equivalent to
  *
  * bytes/s = 62.5 * bytes256 * ClkFreq_ms
  */
 static u64 chan_rate(struct adapter *adap, unsigned int bytes256)
 {
 	u64 v = (u64)bytes256 * adap->params.vpd.cclk;
 
 	return v * 62 + v / 2;
 }
 
 /**
  *	t4_get_chan_txrate - get the current per channel Tx rates
  *	@adap: the adapter
  *	@nic_rate: rates for NIC traffic
  *	@ofld_rate: rates for offloaded traffic
  *
  *	Return the current Tx rates in bytes/s for NIC and offloaded traffic
  *	for each channel.
  */
 void t4_get_chan_txrate(struct adapter *adap, u64 *nic_rate, u64 *ofld_rate)
 {
 	u32 v;
 
 	v = t4_read_reg(adap, A_TP_TX_TRATE);
 	nic_rate[0] = chan_rate(adap, G_TNLRATE0(v));
 	nic_rate[1] = chan_rate(adap, G_TNLRATE1(v));
 	if (adap->chip_params->nchan > 2) {
 		nic_rate[2] = chan_rate(adap, G_TNLRATE2(v));
 		nic_rate[3] = chan_rate(adap, G_TNLRATE3(v));
 	}
 
 	v = t4_read_reg(adap, A_TP_TX_ORATE);
 	ofld_rate[0] = chan_rate(adap, G_OFDRATE0(v));
 	ofld_rate[1] = chan_rate(adap, G_OFDRATE1(v));
 	if (adap->chip_params->nchan > 2) {
 		ofld_rate[2] = chan_rate(adap, G_OFDRATE2(v));
 		ofld_rate[3] = chan_rate(adap, G_OFDRATE3(v));
 	}
 }
 
 /**
  *	t4_set_trace_filter - configure one of the tracing filters
  *	@adap: the adapter
  *	@tp: the desired trace filter parameters
  *	@idx: which filter to configure
  *	@enable: whether to enable or disable the filter
  *
  *	Configures one of the tracing filters available in HW.  If @tp is %NULL
  *	it indicates that the filter is already written in the register and it
  *	just needs to be enabled or disabled.
  */
 int t4_set_trace_filter(struct adapter *adap, const struct trace_params *tp,
     int idx, int enable)
 {
 	int i, ofst = idx * 4;
 	u32 data_reg, mask_reg, cfg;
 	u32 multitrc = F_TRCMULTIFILTER;
 	u32 en = is_t4(adap) ? F_TFEN : F_T5_TFEN;
 
 	if (idx < 0 || idx >= NTRACE)
 		return -EINVAL;
 
 	if (tp == NULL || !enable) {
 		t4_set_reg_field(adap, A_MPS_TRC_FILTER_MATCH_CTL_A + ofst, en,
 		    enable ? en : 0);
 		return 0;
 	}
 
 	/*
 	 * TODO - After T4 data book is updated, specify the exact
 	 * section below.
 	 *
 	 * See T4 data book - MPS section for a complete description
 	 * of the below if..else handling of A_MPS_TRC_CFG register
 	 * value.
 	 */
 	cfg = t4_read_reg(adap, A_MPS_TRC_CFG);
 	if (cfg & F_TRCMULTIFILTER) {
 		/*
 		 * If multiple tracers are enabled, then maximum
 		 * capture size is 2.5KB (FIFO size of a single channel)
 		 * minus 2 flits for CPL_TRACE_PKT header.
 		 */
 		if (tp->snap_len > ((10 * 1024 / 4) - (2 * 8)))
 			return -EINVAL;
 	} else {
 		/*
 		 * If multiple tracers are disabled, to avoid deadlocks
 		 * maximum packet capture size of 9600 bytes is recommended.
 		 * Also in this mode, only trace0 can be enabled and running.
 		 */
 		multitrc = 0;
 		if (tp->snap_len > 9600 || idx)
 			return -EINVAL;
 	}
 
 	if (tp->port > (is_t4(adap) ? 11 : 19) || tp->invert > 1 ||
 	    tp->skip_len > M_TFLENGTH || tp->skip_ofst > M_TFOFFSET ||
 	    tp->min_len > M_TFMINPKTSIZE)
 		return -EINVAL;
 
 	/* stop the tracer we'll be changing */
 	t4_set_reg_field(adap, A_MPS_TRC_FILTER_MATCH_CTL_A + ofst, en, 0);
 
 	idx *= (A_MPS_TRC_FILTER1_MATCH - A_MPS_TRC_FILTER0_MATCH);
 	data_reg = A_MPS_TRC_FILTER0_MATCH + idx;
 	mask_reg = A_MPS_TRC_FILTER0_DONT_CARE + idx;
 
 	for (i = 0; i < TRACE_LEN / 4; i++, data_reg += 4, mask_reg += 4) {
 		t4_write_reg(adap, data_reg, tp->data[i]);
 		t4_write_reg(adap, mask_reg, ~tp->mask[i]);
 	}
 	t4_write_reg(adap, A_MPS_TRC_FILTER_MATCH_CTL_B + ofst,
 		     V_TFCAPTUREMAX(tp->snap_len) |
 		     V_TFMINPKTSIZE(tp->min_len));
 	t4_write_reg(adap, A_MPS_TRC_FILTER_MATCH_CTL_A + ofst,
 		     V_TFOFFSET(tp->skip_ofst) | V_TFLENGTH(tp->skip_len) | en |
 		     (is_t4(adap) ?
 		     V_TFPORT(tp->port) | V_TFINVERTMATCH(tp->invert) :
 		     V_T5_TFPORT(tp->port) | V_T5_TFINVERTMATCH(tp->invert)));
 
 	return 0;
 }
 
 /**
  *	t4_get_trace_filter - query one of the tracing filters
  *	@adap: the adapter
  *	@tp: the current trace filter parameters
  *	@idx: which trace filter to query
  *	@enabled: non-zero if the filter is enabled
  *
  *	Returns the current settings of one of the HW tracing filters.
  */
 void t4_get_trace_filter(struct adapter *adap, struct trace_params *tp, int idx,
 			 int *enabled)
 {
 	u32 ctla, ctlb;
 	int i, ofst = idx * 4;
 	u32 data_reg, mask_reg;
 
 	ctla = t4_read_reg(adap, A_MPS_TRC_FILTER_MATCH_CTL_A + ofst);
 	ctlb = t4_read_reg(adap, A_MPS_TRC_FILTER_MATCH_CTL_B + ofst);
 
 	if (is_t4(adap)) {
 		*enabled = !!(ctla & F_TFEN);
 		tp->port =  G_TFPORT(ctla);
 		tp->invert = !!(ctla & F_TFINVERTMATCH);
 	} else {
 		*enabled = !!(ctla & F_T5_TFEN);
 		tp->port = G_T5_TFPORT(ctla);
 		tp->invert = !!(ctla & F_T5_TFINVERTMATCH);
 	}
 	tp->snap_len = G_TFCAPTUREMAX(ctlb);
 	tp->min_len = G_TFMINPKTSIZE(ctlb);
 	tp->skip_ofst = G_TFOFFSET(ctla);
 	tp->skip_len = G_TFLENGTH(ctla);
 
 	ofst = (A_MPS_TRC_FILTER1_MATCH - A_MPS_TRC_FILTER0_MATCH) * idx;
 	data_reg = A_MPS_TRC_FILTER0_MATCH + ofst;
 	mask_reg = A_MPS_TRC_FILTER0_DONT_CARE + ofst;
 
 	for (i = 0; i < TRACE_LEN / 4; i++, data_reg += 4, mask_reg += 4) {
 		tp->mask[i] = ~t4_read_reg(adap, mask_reg);
 		tp->data[i] = t4_read_reg(adap, data_reg) & tp->mask[i];
 	}
 }
 
 /**
  *	t4_pmtx_get_stats - returns the HW stats from PMTX
  *	@adap: the adapter
  *	@cnt: where to store the count statistics
  *	@cycles: where to store the cycle statistics
  *
  *	Returns performance statistics from PMTX.
  */
 void t4_pmtx_get_stats(struct adapter *adap, u32 cnt[], u64 cycles[])
 {
 	int i;
 	u32 data[2];
 
 	for (i = 0; i < adap->chip_params->pm_stats_cnt; i++) {
 		t4_write_reg(adap, A_PM_TX_STAT_CONFIG, i + 1);
 		cnt[i] = t4_read_reg(adap, A_PM_TX_STAT_COUNT);
 		if (is_t4(adap))
 			cycles[i] = t4_read_reg64(adap, A_PM_TX_STAT_LSB);
 		else {
 			t4_read_indirect(adap, A_PM_TX_DBG_CTRL,
 					 A_PM_TX_DBG_DATA, data, 2,
 					 A_PM_TX_DBG_STAT_MSB);
 			cycles[i] = (((u64)data[0] << 32) | data[1]);
 		}
 	}
 }
 
 /**
  *	t4_pmrx_get_stats - returns the HW stats from PMRX
  *	@adap: the adapter
  *	@cnt: where to store the count statistics
  *	@cycles: where to store the cycle statistics
  *
  *	Returns performance statistics from PMRX.
  */
 void t4_pmrx_get_stats(struct adapter *adap, u32 cnt[], u64 cycles[])
 {
 	int i;
 	u32 data[2];
 
 	for (i = 0; i < adap->chip_params->pm_stats_cnt; i++) {
 		t4_write_reg(adap, A_PM_RX_STAT_CONFIG, i + 1);
 		cnt[i] = t4_read_reg(adap, A_PM_RX_STAT_COUNT);
 		if (is_t4(adap)) {
 			cycles[i] = t4_read_reg64(adap, A_PM_RX_STAT_LSB);
 		} else {
 			t4_read_indirect(adap, A_PM_RX_DBG_CTRL,
 					 A_PM_RX_DBG_DATA, data, 2,
 					 A_PM_RX_DBG_STAT_MSB);
 			cycles[i] = (((u64)data[0] << 32) | data[1]);
 		}
 	}
 }
 
 /**
  *	t4_get_mps_bg_map - return the buffer groups associated with a port
  *	@adap: the adapter
  *	@idx: the port index
  *
  *	Returns a bitmap indicating which MPS buffer groups are associated
  *	with the given port.  Bit i is set if buffer group i is used by the
  *	port.
  */
 static unsigned int t4_get_mps_bg_map(struct adapter *adap, int idx)
 {
 	u32 n;
 
 	if (adap->params.mps_bg_map)
 		return ((adap->params.mps_bg_map >> (idx << 3)) & 0xff);
 
 	n = G_NUMPORTS(t4_read_reg(adap, A_MPS_CMN_CTL));
 	if (n == 0)
 		return idx == 0 ? 0xf : 0;
 	if (n == 1 && chip_id(adap) <= CHELSIO_T5)
 		return idx < 2 ? (3 << (2 * idx)) : 0;
 	return 1 << idx;
 }
 
 /*
  * TP RX e-channels associated with the port.
  */
 static unsigned int t4_get_rx_e_chan_map(struct adapter *adap, int idx)
 {
 	u32 n = G_NUMPORTS(t4_read_reg(adap, A_MPS_CMN_CTL));
 
 	if (n == 0)
 		return idx == 0 ? 0xf : 0;
 	if (n == 1 && chip_id(adap) <= CHELSIO_T5)
 		return idx < 2 ? (3 << (2 * idx)) : 0;
 	return 1 << idx;
 }
 
 /**
  *      t4_get_port_type_description - return Port Type string description
  *      @port_type: firmware Port Type enumeration
  */
 const char *t4_get_port_type_description(enum fw_port_type port_type)
 {
 	static const char *const port_type_description[] = {
 		"Fiber_XFI",
 		"Fiber_XAUI",
 		"BT_SGMII",
 		"BT_XFI",
 		"BT_XAUI",
 		"KX4",
 		"CX4",
 		"KX",
 		"KR",
 		"SFP",
 		"BP_AP",
 		"BP4_AP",
 		"QSFP_10G",
 		"QSA",
 		"QSFP",
 		"BP40_BA",
 		"KR4_100G",
 		"CR4_QSFP",
 		"CR_QSFP",
 		"CR2_QSFP",
 		"SFP28",
 		"KR_SFP28",
 	};
 
 	if (port_type < ARRAY_SIZE(port_type_description))
 		return port_type_description[port_type];
 	return "UNKNOWN";
 }
 
 /**
  *      t4_get_port_stats_offset - collect port stats relative to a previous
  *				   snapshot
  *      @adap: The adapter
  *      @idx: The port
  *      @stats: Current stats to fill
  *      @offset: Previous stats snapshot
  */
 void t4_get_port_stats_offset(struct adapter *adap, int idx,
 		struct port_stats *stats,
 		struct port_stats *offset)
 {
 	u64 *s, *o;
 	int i;
 
 	t4_get_port_stats(adap, idx, stats);
 	for (i = 0, s = (u64 *)stats, o = (u64 *)offset ;
 			i < (sizeof(struct port_stats)/sizeof(u64)) ;
 			i++, s++, o++)
 		*s -= *o;
 }
 
 /**
  *	t4_get_port_stats - collect port statistics
  *	@adap: the adapter
  *	@idx: the port index
  *	@p: the stats structure to fill
  *
  *	Collect statistics related to the given port from HW.
  */
 void t4_get_port_stats(struct adapter *adap, int idx, struct port_stats *p)
 {
 	u32 bgmap = adap2pinfo(adap, idx)->mps_bg_map;
 	u32 stat_ctl = t4_read_reg(adap, A_MPS_STAT_CTL);
 
 #define GET_STAT(name) \
 	t4_read_reg64(adap, \
 	(is_t4(adap) ? PORT_REG(idx, A_MPS_PORT_STAT_##name##_L) : \
 	T5_PORT_REG(idx, A_MPS_PORT_STAT_##name##_L)))
 #define GET_STAT_COM(name) t4_read_reg64(adap, A_MPS_STAT_##name##_L)
 
 	p->tx_pause		= GET_STAT(TX_PORT_PAUSE);
 	p->tx_octets		= GET_STAT(TX_PORT_BYTES);
 	p->tx_frames		= GET_STAT(TX_PORT_FRAMES);
 	p->tx_bcast_frames	= GET_STAT(TX_PORT_BCAST);
 	p->tx_mcast_frames	= GET_STAT(TX_PORT_MCAST);
 	p->tx_ucast_frames	= GET_STAT(TX_PORT_UCAST);
 	p->tx_error_frames	= GET_STAT(TX_PORT_ERROR);
 	p->tx_frames_64		= GET_STAT(TX_PORT_64B);
 	p->tx_frames_65_127	= GET_STAT(TX_PORT_65B_127B);
 	p->tx_frames_128_255	= GET_STAT(TX_PORT_128B_255B);
 	p->tx_frames_256_511	= GET_STAT(TX_PORT_256B_511B);
 	p->tx_frames_512_1023	= GET_STAT(TX_PORT_512B_1023B);
 	p->tx_frames_1024_1518	= GET_STAT(TX_PORT_1024B_1518B);
 	p->tx_frames_1519_max	= GET_STAT(TX_PORT_1519B_MAX);
 	p->tx_drop		= GET_STAT(TX_PORT_DROP);
 	p->tx_ppp0		= GET_STAT(TX_PORT_PPP0);
 	p->tx_ppp1		= GET_STAT(TX_PORT_PPP1);
 	p->tx_ppp2		= GET_STAT(TX_PORT_PPP2);
 	p->tx_ppp3		= GET_STAT(TX_PORT_PPP3);
 	p->tx_ppp4		= GET_STAT(TX_PORT_PPP4);
 	p->tx_ppp5		= GET_STAT(TX_PORT_PPP5);
 	p->tx_ppp6		= GET_STAT(TX_PORT_PPP6);
 	p->tx_ppp7		= GET_STAT(TX_PORT_PPP7);
 
 	if (chip_id(adap) >= CHELSIO_T5) {
 		if (stat_ctl & F_COUNTPAUSESTATTX) {
 			p->tx_frames -= p->tx_pause;
 			p->tx_octets -= p->tx_pause * 64;
 		}
 		if (stat_ctl & F_COUNTPAUSEMCTX)
 			p->tx_mcast_frames -= p->tx_pause;
 	}
 
 	p->rx_pause		= GET_STAT(RX_PORT_PAUSE);
 	p->rx_octets		= GET_STAT(RX_PORT_BYTES);
 	p->rx_frames		= GET_STAT(RX_PORT_FRAMES);
 	p->rx_bcast_frames	= GET_STAT(RX_PORT_BCAST);
 	p->rx_mcast_frames	= GET_STAT(RX_PORT_MCAST);
 	p->rx_ucast_frames	= GET_STAT(RX_PORT_UCAST);
 	p->rx_too_long		= GET_STAT(RX_PORT_MTU_ERROR);
 	p->rx_jabber		= GET_STAT(RX_PORT_MTU_CRC_ERROR);
 	p->rx_fcs_err		= GET_STAT(RX_PORT_CRC_ERROR);
 	p->rx_len_err		= GET_STAT(RX_PORT_LEN_ERROR);
 	p->rx_symbol_err	= GET_STAT(RX_PORT_SYM_ERROR);
 	p->rx_runt		= GET_STAT(RX_PORT_LESS_64B);
 	p->rx_frames_64		= GET_STAT(RX_PORT_64B);
 	p->rx_frames_65_127	= GET_STAT(RX_PORT_65B_127B);
 	p->rx_frames_128_255	= GET_STAT(RX_PORT_128B_255B);
 	p->rx_frames_256_511	= GET_STAT(RX_PORT_256B_511B);
 	p->rx_frames_512_1023	= GET_STAT(RX_PORT_512B_1023B);
 	p->rx_frames_1024_1518	= GET_STAT(RX_PORT_1024B_1518B);
 	p->rx_frames_1519_max	= GET_STAT(RX_PORT_1519B_MAX);
 	p->rx_ppp0		= GET_STAT(RX_PORT_PPP0);
 	p->rx_ppp1		= GET_STAT(RX_PORT_PPP1);
 	p->rx_ppp2		= GET_STAT(RX_PORT_PPP2);
 	p->rx_ppp3		= GET_STAT(RX_PORT_PPP3);
 	p->rx_ppp4		= GET_STAT(RX_PORT_PPP4);
 	p->rx_ppp5		= GET_STAT(RX_PORT_PPP5);
 	p->rx_ppp6		= GET_STAT(RX_PORT_PPP6);
 	p->rx_ppp7		= GET_STAT(RX_PORT_PPP7);
 
 	if (chip_id(adap) >= CHELSIO_T5) {
 		if (stat_ctl & F_COUNTPAUSESTATRX) {
 			p->rx_frames -= p->rx_pause;
 			p->rx_octets -= p->rx_pause * 64;
 		}
 		if (stat_ctl & F_COUNTPAUSEMCRX)
 			p->rx_mcast_frames -= p->rx_pause;
 	}
 
 	p->rx_ovflow0 = (bgmap & 1) ? GET_STAT_COM(RX_BG_0_MAC_DROP_FRAME) : 0;
 	p->rx_ovflow1 = (bgmap & 2) ? GET_STAT_COM(RX_BG_1_MAC_DROP_FRAME) : 0;
 	p->rx_ovflow2 = (bgmap & 4) ? GET_STAT_COM(RX_BG_2_MAC_DROP_FRAME) : 0;
 	p->rx_ovflow3 = (bgmap & 8) ? GET_STAT_COM(RX_BG_3_MAC_DROP_FRAME) : 0;
 	p->rx_trunc0 = (bgmap & 1) ? GET_STAT_COM(RX_BG_0_MAC_TRUNC_FRAME) : 0;
 	p->rx_trunc1 = (bgmap & 2) ? GET_STAT_COM(RX_BG_1_MAC_TRUNC_FRAME) : 0;
 	p->rx_trunc2 = (bgmap & 4) ? GET_STAT_COM(RX_BG_2_MAC_TRUNC_FRAME) : 0;
 	p->rx_trunc3 = (bgmap & 8) ? GET_STAT_COM(RX_BG_3_MAC_TRUNC_FRAME) : 0;
 
 #undef GET_STAT
 #undef GET_STAT_COM
 }
 
 /**
  *	t4_get_lb_stats - collect loopback port statistics
  *	@adap: the adapter
  *	@idx: the loopback port index
  *	@p: the stats structure to fill
  *
  *	Return HW statistics for the given loopback port.
  */
 void t4_get_lb_stats(struct adapter *adap, int idx, struct lb_port_stats *p)
 {
 	u32 bgmap = adap2pinfo(adap, idx)->mps_bg_map;
 
 #define GET_STAT(name) \
 	t4_read_reg64(adap, \
 	(is_t4(adap) ? \
 	PORT_REG(idx, A_MPS_PORT_STAT_LB_PORT_##name##_L) : \
 	T5_PORT_REG(idx, A_MPS_PORT_STAT_LB_PORT_##name##_L)))
 #define GET_STAT_COM(name) t4_read_reg64(adap, A_MPS_STAT_##name##_L)
 
 	p->octets	= GET_STAT(BYTES);
 	p->frames	= GET_STAT(FRAMES);
 	p->bcast_frames	= GET_STAT(BCAST);
 	p->mcast_frames	= GET_STAT(MCAST);
 	p->ucast_frames	= GET_STAT(UCAST);
 	p->error_frames	= GET_STAT(ERROR);
 
 	p->frames_64		= GET_STAT(64B);
 	p->frames_65_127	= GET_STAT(65B_127B);
 	p->frames_128_255	= GET_STAT(128B_255B);
 	p->frames_256_511	= GET_STAT(256B_511B);
 	p->frames_512_1023	= GET_STAT(512B_1023B);
 	p->frames_1024_1518	= GET_STAT(1024B_1518B);
 	p->frames_1519_max	= GET_STAT(1519B_MAX);
 	p->drop			= GET_STAT(DROP_FRAMES);
 
 	p->ovflow0 = (bgmap & 1) ? GET_STAT_COM(RX_BG_0_LB_DROP_FRAME) : 0;
 	p->ovflow1 = (bgmap & 2) ? GET_STAT_COM(RX_BG_1_LB_DROP_FRAME) : 0;
 	p->ovflow2 = (bgmap & 4) ? GET_STAT_COM(RX_BG_2_LB_DROP_FRAME) : 0;
 	p->ovflow3 = (bgmap & 8) ? GET_STAT_COM(RX_BG_3_LB_DROP_FRAME) : 0;
 	p->trunc0 = (bgmap & 1) ? GET_STAT_COM(RX_BG_0_LB_TRUNC_FRAME) : 0;
 	p->trunc1 = (bgmap & 2) ? GET_STAT_COM(RX_BG_1_LB_TRUNC_FRAME) : 0;
 	p->trunc2 = (bgmap & 4) ? GET_STAT_COM(RX_BG_2_LB_TRUNC_FRAME) : 0;
 	p->trunc3 = (bgmap & 8) ? GET_STAT_COM(RX_BG_3_LB_TRUNC_FRAME) : 0;
 
 #undef GET_STAT
 #undef GET_STAT_COM
 }
 
 /**
  *	t4_wol_magic_enable - enable/disable magic packet WoL
  *	@adap: the adapter
  *	@port: the physical port index
  *	@addr: MAC address expected in magic packets, %NULL to disable
  *
  *	Enables/disables magic packet wake-on-LAN for the selected port.
  */
 void t4_wol_magic_enable(struct adapter *adap, unsigned int port,
 			 const u8 *addr)
 {
 	u32 mag_id_reg_l, mag_id_reg_h, port_cfg_reg;
 
 	if (is_t4(adap)) {
 		mag_id_reg_l = PORT_REG(port, A_XGMAC_PORT_MAGIC_MACID_LO);
 		mag_id_reg_h = PORT_REG(port, A_XGMAC_PORT_MAGIC_MACID_HI);
 		port_cfg_reg = PORT_REG(port, A_XGMAC_PORT_CFG2);
 	} else {
 		mag_id_reg_l = T5_PORT_REG(port, A_MAC_PORT_MAGIC_MACID_LO);
 		mag_id_reg_h = T5_PORT_REG(port, A_MAC_PORT_MAGIC_MACID_HI);
 		port_cfg_reg = T5_PORT_REG(port, A_MAC_PORT_CFG2);
 	}
 
 	if (addr) {
 		t4_write_reg(adap, mag_id_reg_l,
 			     (addr[2] << 24) | (addr[3] << 16) |
 			     (addr[4] << 8) | addr[5]);
 		t4_write_reg(adap, mag_id_reg_h,
 			     (addr[0] << 8) | addr[1]);
 	}
 	t4_set_reg_field(adap, port_cfg_reg, F_MAGICEN,
 			 V_MAGICEN(addr != NULL));
 }
 
 /**
  *	t4_wol_pat_enable - enable/disable pattern-based WoL
  *	@adap: the adapter
  *	@port: the physical port index
  *	@map: bitmap of which HW pattern filters to set
  *	@mask0: byte mask for bytes 0-63 of a packet
  *	@mask1: byte mask for bytes 64-127 of a packet
  *	@crc: Ethernet CRC for selected bytes
  *	@enable: enable/disable switch
  *
  *	Sets the pattern filters indicated in @map to mask out the bytes
  *	specified in @mask0/@mask1 in received packets and compare the CRC of
  *	the resulting packet against @crc.  If @enable is %true pattern-based
  *	WoL is enabled, otherwise disabled.
  */
 int t4_wol_pat_enable(struct adapter *adap, unsigned int port, unsigned int map,
 		      u64 mask0, u64 mask1, unsigned int crc, bool enable)
 {
 	int i;
 	u32 port_cfg_reg;
 
 	if (is_t4(adap))
 		port_cfg_reg = PORT_REG(port, A_XGMAC_PORT_CFG2);
 	else
 		port_cfg_reg = T5_PORT_REG(port, A_MAC_PORT_CFG2);
 
 	if (!enable) {
 		t4_set_reg_field(adap, port_cfg_reg, F_PATEN, 0);
 		return 0;
 	}
 	if (map > 0xff)
 		return -EINVAL;
 
 #define EPIO_REG(name) \
 	(is_t4(adap) ? PORT_REG(port, A_XGMAC_PORT_EPIO_##name) : \
 	T5_PORT_REG(port, A_MAC_PORT_EPIO_##name))
 
 	t4_write_reg(adap, EPIO_REG(DATA1), mask0 >> 32);
 	t4_write_reg(adap, EPIO_REG(DATA2), mask1);
 	t4_write_reg(adap, EPIO_REG(DATA3), mask1 >> 32);
 
 	for (i = 0; i < NWOL_PAT; i++, map >>= 1) {
 		if (!(map & 1))
 			continue;
 
 		/* write byte masks */
 		t4_write_reg(adap, EPIO_REG(DATA0), mask0);
 		t4_write_reg(adap, EPIO_REG(OP), V_ADDRESS(i) | F_EPIOWR);
 		t4_read_reg(adap, EPIO_REG(OP));                /* flush */
 		if (t4_read_reg(adap, EPIO_REG(OP)) & F_BUSY)
 			return -ETIMEDOUT;
 
 		/* write CRC */
 		t4_write_reg(adap, EPIO_REG(DATA0), crc);
 		t4_write_reg(adap, EPIO_REG(OP), V_ADDRESS(i + 32) | F_EPIOWR);
 		t4_read_reg(adap, EPIO_REG(OP));                /* flush */
 		if (t4_read_reg(adap, EPIO_REG(OP)) & F_BUSY)
 			return -ETIMEDOUT;
 	}
 #undef EPIO_REG
 
 	t4_set_reg_field(adap, port_cfg_reg, 0, F_PATEN);
 	return 0;
 }
 
 /*     t4_mk_filtdelwr - create a delete filter WR
  *     @ftid: the filter ID
  *     @wr: the filter work request to populate
  *     @qid: ingress queue to receive the delete notification
  *
  *     Creates a filter work request to delete the supplied filter.  If @qid is
  *     negative the delete notification is suppressed.
  */
 void t4_mk_filtdelwr(unsigned int ftid, struct fw_filter_wr *wr, int qid)
 {
 	memset(wr, 0, sizeof(*wr));
 	wr->op_pkd = cpu_to_be32(V_FW_WR_OP(FW_FILTER_WR));
 	wr->len16_pkd = cpu_to_be32(V_FW_WR_LEN16(sizeof(*wr) / 16));
 	wr->tid_to_iq = cpu_to_be32(V_FW_FILTER_WR_TID(ftid) |
 				    V_FW_FILTER_WR_NOREPLY(qid < 0));
 	wr->del_filter_to_l2tix = cpu_to_be32(F_FW_FILTER_WR_DEL_FILTER);
 	if (qid >= 0)
 		wr->rx_chan_rx_rpl_iq =
 				cpu_to_be16(V_FW_FILTER_WR_RX_RPL_IQ(qid));
 }
 
 #define INIT_CMD(var, cmd, rd_wr) do { \
 	(var).op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_##cmd##_CMD) | \
 					F_FW_CMD_REQUEST | \
 					F_FW_CMD_##rd_wr); \
 	(var).retval_len16 = cpu_to_be32(FW_LEN16(var)); \
 } while (0)
 
 int t4_fwaddrspace_write(struct adapter *adap, unsigned int mbox,
 			  u32 addr, u32 val)
 {
 	u32 ldst_addrspace;
 	struct fw_ldst_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	ldst_addrspace = V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_FIRMWARE);
 	c.op_to_addrspace = cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
 					F_FW_CMD_REQUEST |
 					F_FW_CMD_WRITE |
 					ldst_addrspace);
 	c.cycles_to_len16 = cpu_to_be32(FW_LEN16(c));
 	c.u.addrval.addr = cpu_to_be32(addr);
 	c.u.addrval.val = cpu_to_be32(val);
 
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_mdio_rd - read a PHY register through MDIO
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@phy_addr: the PHY address
  *	@mmd: the PHY MMD to access (0 for clause 22 PHYs)
  *	@reg: the register to read
  *	@valp: where to store the value
  *
  *	Issues a FW command through the given mailbox to read a PHY register.
  */
 int t4_mdio_rd(struct adapter *adap, unsigned int mbox, unsigned int phy_addr,
 	       unsigned int mmd, unsigned int reg, unsigned int *valp)
 {
 	int ret;
 	u32 ldst_addrspace;
 	struct fw_ldst_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	ldst_addrspace = V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_MDIO);
 	c.op_to_addrspace = cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
 					F_FW_CMD_REQUEST | F_FW_CMD_READ |
 					ldst_addrspace);
 	c.cycles_to_len16 = cpu_to_be32(FW_LEN16(c));
 	c.u.mdio.paddr_mmd = cpu_to_be16(V_FW_LDST_CMD_PADDR(phy_addr) |
 					 V_FW_LDST_CMD_MMD(mmd));
 	c.u.mdio.raddr = cpu_to_be16(reg);
 
 	ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
 	if (ret == 0)
 		*valp = be16_to_cpu(c.u.mdio.rval);
 	return ret;
 }
 
 /**
  *	t4_mdio_wr - write a PHY register through MDIO
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@phy_addr: the PHY address
  *	@mmd: the PHY MMD to access (0 for clause 22 PHYs)
  *	@reg: the register to write
  *	@valp: value to write
  *
  *	Issues a FW command through the given mailbox to write a PHY register.
  */
 int t4_mdio_wr(struct adapter *adap, unsigned int mbox, unsigned int phy_addr,
 	       unsigned int mmd, unsigned int reg, unsigned int val)
 {
 	u32 ldst_addrspace;
 	struct fw_ldst_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	ldst_addrspace = V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_MDIO);
 	c.op_to_addrspace = cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
 					F_FW_CMD_REQUEST | F_FW_CMD_WRITE |
 					ldst_addrspace);
 	c.cycles_to_len16 = cpu_to_be32(FW_LEN16(c));
 	c.u.mdio.paddr_mmd = cpu_to_be16(V_FW_LDST_CMD_PADDR(phy_addr) |
 					 V_FW_LDST_CMD_MMD(mmd));
 	c.u.mdio.raddr = cpu_to_be16(reg);
 	c.u.mdio.rval = cpu_to_be16(val);
 
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *
  *	t4_sge_decode_idma_state - decode the idma state
  *	@adap: the adapter
  *	@state: the state idma is stuck in
  */
 void t4_sge_decode_idma_state(struct adapter *adapter, int state)
 {
 	static const char * const t4_decode[] = {
 		"IDMA_IDLE",
 		"IDMA_PUSH_MORE_CPL_FIFO",
 		"IDMA_PUSH_CPL_MSG_HEADER_TO_FIFO",
 		"Not used",
 		"IDMA_PHYSADDR_SEND_PCIEHDR",
 		"IDMA_PHYSADDR_SEND_PAYLOAD_FIRST",
 		"IDMA_PHYSADDR_SEND_PAYLOAD",
 		"IDMA_SEND_FIFO_TO_IMSG",
 		"IDMA_FL_REQ_DATA_FL_PREP",
 		"IDMA_FL_REQ_DATA_FL",
 		"IDMA_FL_DROP",
 		"IDMA_FL_H_REQ_HEADER_FL",
 		"IDMA_FL_H_SEND_PCIEHDR",
 		"IDMA_FL_H_PUSH_CPL_FIFO",
 		"IDMA_FL_H_SEND_CPL",
 		"IDMA_FL_H_SEND_IP_HDR_FIRST",
 		"IDMA_FL_H_SEND_IP_HDR",
 		"IDMA_FL_H_REQ_NEXT_HEADER_FL",
 		"IDMA_FL_H_SEND_NEXT_PCIEHDR",
 		"IDMA_FL_H_SEND_IP_HDR_PADDING",
 		"IDMA_FL_D_SEND_PCIEHDR",
 		"IDMA_FL_D_SEND_CPL_AND_IP_HDR",
 		"IDMA_FL_D_REQ_NEXT_DATA_FL",
 		"IDMA_FL_SEND_PCIEHDR",
 		"IDMA_FL_PUSH_CPL_FIFO",
 		"IDMA_FL_SEND_CPL",
 		"IDMA_FL_SEND_PAYLOAD_FIRST",
 		"IDMA_FL_SEND_PAYLOAD",
 		"IDMA_FL_REQ_NEXT_DATA_FL",
 		"IDMA_FL_SEND_NEXT_PCIEHDR",
 		"IDMA_FL_SEND_PADDING",
 		"IDMA_FL_SEND_COMPLETION_TO_IMSG",
 		"IDMA_FL_SEND_FIFO_TO_IMSG",
 		"IDMA_FL_REQ_DATAFL_DONE",
 		"IDMA_FL_REQ_HEADERFL_DONE",
 	};
 	static const char * const t5_decode[] = {
 		"IDMA_IDLE",
 		"IDMA_ALMOST_IDLE",
 		"IDMA_PUSH_MORE_CPL_FIFO",
 		"IDMA_PUSH_CPL_MSG_HEADER_TO_FIFO",
 		"IDMA_SGEFLRFLUSH_SEND_PCIEHDR",
 		"IDMA_PHYSADDR_SEND_PCIEHDR",
 		"IDMA_PHYSADDR_SEND_PAYLOAD_FIRST",
 		"IDMA_PHYSADDR_SEND_PAYLOAD",
 		"IDMA_SEND_FIFO_TO_IMSG",
 		"IDMA_FL_REQ_DATA_FL",
 		"IDMA_FL_DROP",
 		"IDMA_FL_DROP_SEND_INC",
 		"IDMA_FL_H_REQ_HEADER_FL",
 		"IDMA_FL_H_SEND_PCIEHDR",
 		"IDMA_FL_H_PUSH_CPL_FIFO",
 		"IDMA_FL_H_SEND_CPL",
 		"IDMA_FL_H_SEND_IP_HDR_FIRST",
 		"IDMA_FL_H_SEND_IP_HDR",
 		"IDMA_FL_H_REQ_NEXT_HEADER_FL",
 		"IDMA_FL_H_SEND_NEXT_PCIEHDR",
 		"IDMA_FL_H_SEND_IP_HDR_PADDING",
 		"IDMA_FL_D_SEND_PCIEHDR",
 		"IDMA_FL_D_SEND_CPL_AND_IP_HDR",
 		"IDMA_FL_D_REQ_NEXT_DATA_FL",
 		"IDMA_FL_SEND_PCIEHDR",
 		"IDMA_FL_PUSH_CPL_FIFO",
 		"IDMA_FL_SEND_CPL",
 		"IDMA_FL_SEND_PAYLOAD_FIRST",
 		"IDMA_FL_SEND_PAYLOAD",
 		"IDMA_FL_REQ_NEXT_DATA_FL",
 		"IDMA_FL_SEND_NEXT_PCIEHDR",
 		"IDMA_FL_SEND_PADDING",
 		"IDMA_FL_SEND_COMPLETION_TO_IMSG",
 	};
 	static const char * const t6_decode[] = {
 		"IDMA_IDLE",
 		"IDMA_PUSH_MORE_CPL_FIFO",
 		"IDMA_PUSH_CPL_MSG_HEADER_TO_FIFO",
 		"IDMA_SGEFLRFLUSH_SEND_PCIEHDR",
 		"IDMA_PHYSADDR_SEND_PCIEHDR",
 		"IDMA_PHYSADDR_SEND_PAYLOAD_FIRST",
 		"IDMA_PHYSADDR_SEND_PAYLOAD",
 		"IDMA_FL_REQ_DATA_FL",
 		"IDMA_FL_DROP",
 		"IDMA_FL_DROP_SEND_INC",
 		"IDMA_FL_H_REQ_HEADER_FL",
 		"IDMA_FL_H_SEND_PCIEHDR",
 		"IDMA_FL_H_PUSH_CPL_FIFO",
 		"IDMA_FL_H_SEND_CPL",
 		"IDMA_FL_H_SEND_IP_HDR_FIRST",
 		"IDMA_FL_H_SEND_IP_HDR",
 		"IDMA_FL_H_REQ_NEXT_HEADER_FL",
 		"IDMA_FL_H_SEND_NEXT_PCIEHDR",
 		"IDMA_FL_H_SEND_IP_HDR_PADDING",
 		"IDMA_FL_D_SEND_PCIEHDR",
 		"IDMA_FL_D_SEND_CPL_AND_IP_HDR",
 		"IDMA_FL_D_REQ_NEXT_DATA_FL",
 		"IDMA_FL_SEND_PCIEHDR",
 		"IDMA_FL_PUSH_CPL_FIFO",
 		"IDMA_FL_SEND_CPL",
 		"IDMA_FL_SEND_PAYLOAD_FIRST",
 		"IDMA_FL_SEND_PAYLOAD",
 		"IDMA_FL_REQ_NEXT_DATA_FL",
 		"IDMA_FL_SEND_NEXT_PCIEHDR",
 		"IDMA_FL_SEND_PADDING",
 		"IDMA_FL_SEND_COMPLETION_TO_IMSG",
 	};
 	static const u32 sge_regs[] = {
 		A_SGE_DEBUG_DATA_LOW_INDEX_2,
 		A_SGE_DEBUG_DATA_LOW_INDEX_3,
 		A_SGE_DEBUG_DATA_HIGH_INDEX_10,
 	};
 	const char * const *sge_idma_decode;
 	int sge_idma_decode_nstates;
 	int i;
 	unsigned int chip_version = chip_id(adapter);
 
 	/* Select the right set of decode strings to dump depending on the
 	 * adapter chip type.
 	 */
 	switch (chip_version) {
 	case CHELSIO_T4:
 		sge_idma_decode = (const char * const *)t4_decode;
 		sge_idma_decode_nstates = ARRAY_SIZE(t4_decode);
 		break;
 
 	case CHELSIO_T5:
 		sge_idma_decode = (const char * const *)t5_decode;
 		sge_idma_decode_nstates = ARRAY_SIZE(t5_decode);
 		break;
 
 	case CHELSIO_T6:
 		sge_idma_decode = (const char * const *)t6_decode;
 		sge_idma_decode_nstates = ARRAY_SIZE(t6_decode);
 		break;
 
 	default:
 		CH_ERR(adapter,	"Unsupported chip version %d\n", chip_version);
 		return;
 	}
 
 	if (state < sge_idma_decode_nstates)
 		CH_WARN(adapter, "idma state %s\n", sge_idma_decode[state]);
 	else
 		CH_WARN(adapter, "idma state %d unknown\n", state);
 
 	for (i = 0; i < ARRAY_SIZE(sge_regs); i++)
 		CH_WARN(adapter, "SGE register %#x value %#x\n",
 			sge_regs[i], t4_read_reg(adapter, sge_regs[i]));
 }
 
 /**
  *      t4_sge_ctxt_flush - flush the SGE context cache
  *      @adap: the adapter
  *      @mbox: mailbox to use for the FW command
  *
  *      Issues a FW command through the given mailbox to flush the
  *      SGE context cache.
  */
 int t4_sge_ctxt_flush(struct adapter *adap, unsigned int mbox)
 {
 	int ret;
 	u32 ldst_addrspace;
 	struct fw_ldst_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	ldst_addrspace = V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_SGE_EGRC);
 	c.op_to_addrspace = cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
 					F_FW_CMD_REQUEST | F_FW_CMD_READ |
 					ldst_addrspace);
 	c.cycles_to_len16 = cpu_to_be32(FW_LEN16(c));
 	c.u.idctxt.msg_ctxtflush = cpu_to_be32(F_FW_LDST_CMD_CTXTFLUSH);
 
 	ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
 	return ret;
 }
 
 /**
  *      t4_fw_hello - establish communication with FW
  *      @adap: the adapter
  *      @mbox: mailbox to use for the FW command
  *      @evt_mbox: mailbox to receive async FW events
  *      @master: specifies the caller's willingness to be the device master
  *	@state: returns the current device state (if non-NULL)
  *
  *	Issues a command to establish communication with FW.  Returns either
  *	an error (negative integer) or the mailbox of the Master PF.
  */
 int t4_fw_hello(struct adapter *adap, unsigned int mbox, unsigned int evt_mbox,
 		enum dev_master master, enum dev_state *state)
 {
 	int ret;
 	struct fw_hello_cmd c;
 	u32 v;
 	unsigned int master_mbox;
 	int retries = FW_CMD_HELLO_RETRIES;
 
 retry:
 	memset(&c, 0, sizeof(c));
 	INIT_CMD(c, HELLO, WRITE);
 	c.err_to_clearinit = cpu_to_be32(
 		V_FW_HELLO_CMD_MASTERDIS(master == MASTER_CANT) |
 		V_FW_HELLO_CMD_MASTERFORCE(master == MASTER_MUST) |
 		V_FW_HELLO_CMD_MBMASTER(master == MASTER_MUST ?
 					mbox : M_FW_HELLO_CMD_MBMASTER) |
 		V_FW_HELLO_CMD_MBASYNCNOT(evt_mbox) |
 		V_FW_HELLO_CMD_STAGE(FW_HELLO_CMD_STAGE_OS) |
 		F_FW_HELLO_CMD_CLEARINIT);
 
 	/*
 	 * Issue the HELLO command to the firmware.  If it's not successful
 	 * but indicates that we got a "busy" or "timeout" condition, retry
 	 * the HELLO until we exhaust our retry limit.  If we do exceed our
 	 * retry limit, check to see if the firmware left us any error
 	 * information and report that if so ...
 	 */
 	ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
 	if (ret != FW_SUCCESS) {
 		if ((ret == -EBUSY || ret == -ETIMEDOUT) && retries-- > 0)
 			goto retry;
 		if (t4_read_reg(adap, A_PCIE_FW) & F_PCIE_FW_ERR)
 			t4_report_fw_error(adap);
 		return ret;
 	}
 
 	v = be32_to_cpu(c.err_to_clearinit);
 	master_mbox = G_FW_HELLO_CMD_MBMASTER(v);
 	if (state) {
 		if (v & F_FW_HELLO_CMD_ERR)
 			*state = DEV_STATE_ERR;
 		else if (v & F_FW_HELLO_CMD_INIT)
 			*state = DEV_STATE_INIT;
 		else
 			*state = DEV_STATE_UNINIT;
 	}
 
 	/*
 	 * If we're not the Master PF then we need to wait around for the
 	 * Master PF Driver to finish setting up the adapter.
 	 *
 	 * Note that we also do this wait if we're a non-Master-capable PF and
 	 * there is no current Master PF; a Master PF may show up momentarily
 	 * and we wouldn't want to fail pointlessly.  (This can happen when an
 	 * OS loads lots of different drivers rapidly at the same time).  In
 	 * this case, the Master PF returned by the firmware will be
 	 * M_PCIE_FW_MASTER so the test below will work ...
 	 */
 	if ((v & (F_FW_HELLO_CMD_ERR|F_FW_HELLO_CMD_INIT)) == 0 &&
 	    master_mbox != mbox) {
 		int waiting = FW_CMD_HELLO_TIMEOUT;
 
 		/*
 		 * Wait for the firmware to either indicate an error or
 		 * initialized state.  If we see either of these we bail out
 		 * and report the issue to the caller.  If we exhaust the
 		 * "hello timeout" and we haven't exhausted our retries, try
 		 * again.  Otherwise bail with a timeout error.
 		 */
 		for (;;) {
 			u32 pcie_fw;
 
 			msleep(50);
 			waiting -= 50;
 
 			/*
 			 * If neither Error nor Initialialized are indicated
 			 * by the firmware keep waiting till we exhaust our
 			 * timeout ... and then retry if we haven't exhausted
 			 * our retries ...
 			 */
 			pcie_fw = t4_read_reg(adap, A_PCIE_FW);
 			if (!(pcie_fw & (F_PCIE_FW_ERR|F_PCIE_FW_INIT))) {
 				if (waiting <= 0) {
 					if (retries-- > 0)
 						goto retry;
 
 					return -ETIMEDOUT;
 				}
 				continue;
 			}
 
 			/*
 			 * We either have an Error or Initialized condition
 			 * report errors preferentially.
 			 */
 			if (state) {
 				if (pcie_fw & F_PCIE_FW_ERR)
 					*state = DEV_STATE_ERR;
 				else if (pcie_fw & F_PCIE_FW_INIT)
 					*state = DEV_STATE_INIT;
 			}
 
 			/*
 			 * If we arrived before a Master PF was selected and
 			 * there's not a valid Master PF, grab its identity
 			 * for our caller.
 			 */
 			if (master_mbox == M_PCIE_FW_MASTER &&
 			    (pcie_fw & F_PCIE_FW_MASTER_VLD))
 				master_mbox = G_PCIE_FW_MASTER(pcie_fw);
 			break;
 		}
 	}
 
 	return master_mbox;
 }
 
 /**
  *	t4_fw_bye - end communication with FW
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *
  *	Issues a command to terminate communication with FW.
  */
 int t4_fw_bye(struct adapter *adap, unsigned int mbox)
 {
 	struct fw_bye_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	INIT_CMD(c, BYE, WRITE);
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_fw_reset - issue a reset to FW
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@reset: specifies the type of reset to perform
  *
  *	Issues a reset command of the specified type to FW.
  */
 int t4_fw_reset(struct adapter *adap, unsigned int mbox, int reset)
 {
 	struct fw_reset_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	INIT_CMD(c, RESET, WRITE);
 	c.val = cpu_to_be32(reset);
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_fw_halt - issue a reset/halt to FW and put uP into RESET
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW RESET command (if desired)
  *	@force: force uP into RESET even if FW RESET command fails
  *
  *	Issues a RESET command to firmware (if desired) with a HALT indication
  *	and then puts the microprocessor into RESET state.  The RESET command
  *	will only be issued if a legitimate mailbox is provided (mbox <=
  *	M_PCIE_FW_MASTER).
  *
  *	This is generally used in order for the host to safely manipulate the
  *	adapter without fear of conflicting with whatever the firmware might
  *	be doing.  The only way out of this state is to RESTART the firmware
  *	...
  */
 int t4_fw_halt(struct adapter *adap, unsigned int mbox, int force)
 {
 	int ret = 0;
 
 	/*
 	 * If a legitimate mailbox is provided, issue a RESET command
 	 * with a HALT indication.
 	 */
 	if (adap->flags & FW_OK && mbox <= M_PCIE_FW_MASTER) {
 		struct fw_reset_cmd c;
 
 		memset(&c, 0, sizeof(c));
 		INIT_CMD(c, RESET, WRITE);
 		c.val = cpu_to_be32(F_PIORST | F_PIORSTMODE);
 		c.halt_pkd = cpu_to_be32(F_FW_RESET_CMD_HALT);
 		ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 	}
 
 	/*
 	 * Normally we won't complete the operation if the firmware RESET
 	 * command fails but if our caller insists we'll go ahead and put the
 	 * uP into RESET.  This can be useful if the firmware is hung or even
 	 * missing ...  We'll have to take the risk of putting the uP into
 	 * RESET without the cooperation of firmware in that case.
 	 *
 	 * We also force the firmware's HALT flag to be on in case we bypassed
 	 * the firmware RESET command above or we're dealing with old firmware
 	 * which doesn't have the HALT capability.  This will serve as a flag
 	 * for the incoming firmware to know that it's coming out of a HALT
 	 * rather than a RESET ... if it's new enough to understand that ...
 	 */
 	if (ret == 0 || force) {
 		t4_set_reg_field(adap, A_CIM_BOOT_CFG, F_UPCRST, F_UPCRST);
 		t4_set_reg_field(adap, A_PCIE_FW, F_PCIE_FW_HALT,
 				 F_PCIE_FW_HALT);
 	}
 
 	/*
 	 * And we always return the result of the firmware RESET command
 	 * even when we force the uP into RESET ...
 	 */
 	return ret;
 }
 
 /**
  *	t4_fw_restart - restart the firmware by taking the uP out of RESET
  *	@adap: the adapter
  *
  *	Restart firmware previously halted by t4_fw_halt().  On successful
  *	return the previous PF Master remains as the new PF Master and there
  *	is no need to issue a new HELLO command, etc.
  */
 int t4_fw_restart(struct adapter *adap, unsigned int mbox)
 {
 	int ms;
 
 	t4_set_reg_field(adap, A_CIM_BOOT_CFG, F_UPCRST, 0);
 	for (ms = 0; ms < FW_CMD_MAX_TIMEOUT; ) {
 		if (!(t4_read_reg(adap, A_PCIE_FW) & F_PCIE_FW_HALT))
 			return FW_SUCCESS;
 		msleep(100);
 		ms += 100;
 	}
 
 	return -ETIMEDOUT;
 }
 
 /**
  *	t4_fw_upgrade - perform all of the steps necessary to upgrade FW
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW RESET command (if desired)
  *	@fw_data: the firmware image to write
  *	@size: image size
  *	@force: force upgrade even if firmware doesn't cooperate
  *
  *	Perform all of the steps necessary for upgrading an adapter's
  *	firmware image.  Normally this requires the cooperation of the
  *	existing firmware in order to halt all existing activities
  *	but if an invalid mailbox token is passed in we skip that step
  *	(though we'll still put the adapter microprocessor into RESET in
  *	that case).
  *
  *	On successful return the new firmware will have been loaded and
  *	the adapter will have been fully RESET losing all previous setup
  *	state.  On unsuccessful return the adapter may be completely hosed ...
  *	positive errno indicates that the adapter is ~probably~ intact, a
  *	negative errno indicates that things are looking bad ...
  */
 int t4_fw_upgrade(struct adapter *adap, unsigned int mbox,
 		  const u8 *fw_data, unsigned int size, int force)
 {
 	const struct fw_hdr *fw_hdr = (const struct fw_hdr *)fw_data;
 	unsigned int bootstrap =
 	    be32_to_cpu(fw_hdr->magic) == FW_HDR_MAGIC_BOOTSTRAP;
 	int ret;
 
 	if (!t4_fw_matches_chip(adap, fw_hdr))
 		return -EINVAL;
 
 	if (!bootstrap) {
 		ret = t4_fw_halt(adap, mbox, force);
 		if (ret < 0 && !force)
 			return ret;
 	}
 
 	ret = t4_load_fw(adap, fw_data, size);
 	if (ret < 0 || bootstrap)
 		return ret;
 
 	return t4_fw_restart(adap, mbox);
 }
 
 /**
  *	t4_fw_initialize - ask FW to initialize the device
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *
  *	Issues a command to FW to partially initialize the device.  This
  *	performs initialization that generally doesn't depend on user input.
  */
 int t4_fw_initialize(struct adapter *adap, unsigned int mbox)
 {
 	struct fw_initialize_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	INIT_CMD(c, INITIALIZE, WRITE);
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_query_params_rw - query FW or device parameters
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@pf: the PF
  *	@vf: the VF
  *	@nparams: the number of parameters
  *	@params: the parameter names
  *	@val: the parameter values
  *	@rw: Write and read flag
  *
  *	Reads the value of FW or device parameters.  Up to 7 parameters can be
  *	queried at once.
  */
 int t4_query_params_rw(struct adapter *adap, unsigned int mbox, unsigned int pf,
 		       unsigned int vf, unsigned int nparams, const u32 *params,
 		       u32 *val, int rw)
 {
 	int i, ret;
 	struct fw_params_cmd c;
 	__be32 *p = &c.param[0].mnem;
 
 	if (nparams > 7)
 		return -EINVAL;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_PARAMS_CMD) |
 				  F_FW_CMD_REQUEST | F_FW_CMD_READ |
 				  V_FW_PARAMS_CMD_PFN(pf) |
 				  V_FW_PARAMS_CMD_VFN(vf));
 	c.retval_len16 = cpu_to_be32(FW_LEN16(c));
 
 	for (i = 0; i < nparams; i++) {
 		*p++ = cpu_to_be32(*params++);
 		if (rw)
 			*p = cpu_to_be32(*(val + i));
 		p++;
 	}
 
 	ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
 	if (ret == 0)
 		for (i = 0, p = &c.param[0].val; i < nparams; i++, p += 2)
 			*val++ = be32_to_cpu(*p);
 	return ret;
 }
 
 int t4_query_params(struct adapter *adap, unsigned int mbox, unsigned int pf,
 		    unsigned int vf, unsigned int nparams, const u32 *params,
 		    u32 *val)
 {
 	return t4_query_params_rw(adap, mbox, pf, vf, nparams, params, val, 0);
 }
 
 /**
  *      t4_set_params_timeout - sets FW or device parameters
  *      @adap: the adapter
  *      @mbox: mailbox to use for the FW command
  *      @pf: the PF
  *      @vf: the VF
  *      @nparams: the number of parameters
  *      @params: the parameter names
  *      @val: the parameter values
  *      @timeout: the timeout time
  *
  *      Sets the value of FW or device parameters.  Up to 7 parameters can be
  *      specified at once.
  */
 int t4_set_params_timeout(struct adapter *adap, unsigned int mbox,
 			  unsigned int pf, unsigned int vf,
 			  unsigned int nparams, const u32 *params,
 			  const u32 *val, int timeout)
 {
 	struct fw_params_cmd c;
 	__be32 *p = &c.param[0].mnem;
 
 	if (nparams > 7)
 		return -EINVAL;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_PARAMS_CMD) |
 				  F_FW_CMD_REQUEST | F_FW_CMD_WRITE |
 				  V_FW_PARAMS_CMD_PFN(pf) |
 				  V_FW_PARAMS_CMD_VFN(vf));
 	c.retval_len16 = cpu_to_be32(FW_LEN16(c));
 
 	while (nparams--) {
 		*p++ = cpu_to_be32(*params++);
 		*p++ = cpu_to_be32(*val++);
 	}
 
 	return t4_wr_mbox_timeout(adap, mbox, &c, sizeof(c), NULL, timeout);
 }
 
 /**
  *	t4_set_params - sets FW or device parameters
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@pf: the PF
  *	@vf: the VF
  *	@nparams: the number of parameters
  *	@params: the parameter names
  *	@val: the parameter values
  *
  *	Sets the value of FW or device parameters.  Up to 7 parameters can be
  *	specified at once.
  */
 int t4_set_params(struct adapter *adap, unsigned int mbox, unsigned int pf,
 		  unsigned int vf, unsigned int nparams, const u32 *params,
 		  const u32 *val)
 {
 	return t4_set_params_timeout(adap, mbox, pf, vf, nparams, params, val,
 				     FW_CMD_MAX_TIMEOUT);
 }
 
 /**
  *	t4_cfg_pfvf - configure PF/VF resource limits
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@pf: the PF being configured
  *	@vf: the VF being configured
  *	@txq: the max number of egress queues
  *	@txq_eth_ctrl: the max number of egress Ethernet or control queues
  *	@rxqi: the max number of interrupt-capable ingress queues
  *	@rxq: the max number of interruptless ingress queues
  *	@tc: the PCI traffic class
  *	@vi: the max number of virtual interfaces
  *	@cmask: the channel access rights mask for the PF/VF
  *	@pmask: the port access rights mask for the PF/VF
  *	@nexact: the maximum number of exact MPS filters
  *	@rcaps: read capabilities
  *	@wxcaps: write/execute capabilities
  *
  *	Configures resource limits and capabilities for a physical or virtual
  *	function.
  */
 int t4_cfg_pfvf(struct adapter *adap, unsigned int mbox, unsigned int pf,
 		unsigned int vf, unsigned int txq, unsigned int txq_eth_ctrl,
 		unsigned int rxqi, unsigned int rxq, unsigned int tc,
 		unsigned int vi, unsigned int cmask, unsigned int pmask,
 		unsigned int nexact, unsigned int rcaps, unsigned int wxcaps)
 {
 	struct fw_pfvf_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_PFVF_CMD) | F_FW_CMD_REQUEST |
 				  F_FW_CMD_WRITE | V_FW_PFVF_CMD_PFN(pf) |
 				  V_FW_PFVF_CMD_VFN(vf));
 	c.retval_len16 = cpu_to_be32(FW_LEN16(c));
 	c.niqflint_niq = cpu_to_be32(V_FW_PFVF_CMD_NIQFLINT(rxqi) |
 				     V_FW_PFVF_CMD_NIQ(rxq));
 	c.type_to_neq = cpu_to_be32(V_FW_PFVF_CMD_CMASK(cmask) |
 				    V_FW_PFVF_CMD_PMASK(pmask) |
 				    V_FW_PFVF_CMD_NEQ(txq));
 	c.tc_to_nexactf = cpu_to_be32(V_FW_PFVF_CMD_TC(tc) |
 				      V_FW_PFVF_CMD_NVI(vi) |
 				      V_FW_PFVF_CMD_NEXACTF(nexact));
 	c.r_caps_to_nethctrl = cpu_to_be32(V_FW_PFVF_CMD_R_CAPS(rcaps) |
 				     V_FW_PFVF_CMD_WX_CAPS(wxcaps) |
 				     V_FW_PFVF_CMD_NETHCTRL(txq_eth_ctrl));
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_alloc_vi_func - allocate a virtual interface
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@port: physical port associated with the VI
  *	@pf: the PF owning the VI
  *	@vf: the VF owning the VI
  *	@nmac: number of MAC addresses needed (1 to 5)
  *	@mac: the MAC addresses of the VI
  *	@rss_size: size of RSS table slice associated with this VI
  *	@portfunc: which Port Application Function MAC Address is desired
  *	@idstype: Intrusion Detection Type
  *
  *	Allocates a virtual interface for the given physical port.  If @mac is
  *	not %NULL it contains the MAC addresses of the VI as assigned by FW.
  *	If @rss_size is %NULL the VI is not assigned any RSS slice by FW.
  *	@mac should be large enough to hold @nmac Ethernet addresses, they are
  *	stored consecutively so the space needed is @nmac * 6 bytes.
  *	Returns a negative error number or the non-negative VI id.
  */
 int t4_alloc_vi_func(struct adapter *adap, unsigned int mbox,
 		     unsigned int port, unsigned int pf, unsigned int vf,
 		     unsigned int nmac, u8 *mac, u16 *rss_size,
 		     unsigned int portfunc, unsigned int idstype)
 {
 	int ret;
 	struct fw_vi_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_VI_CMD) | F_FW_CMD_REQUEST |
 				  F_FW_CMD_WRITE | F_FW_CMD_EXEC |
 				  V_FW_VI_CMD_PFN(pf) | V_FW_VI_CMD_VFN(vf));
 	c.alloc_to_len16 = cpu_to_be32(F_FW_VI_CMD_ALLOC | FW_LEN16(c));
 	c.type_to_viid = cpu_to_be16(V_FW_VI_CMD_TYPE(idstype) |
 				     V_FW_VI_CMD_FUNC(portfunc));
 	c.portid_pkd = V_FW_VI_CMD_PORTID(port);
 	c.nmac = nmac - 1;
 	if(!rss_size)
 		c.norss_rsssize = F_FW_VI_CMD_NORSS;
 
 	ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
 	if (ret)
 		return ret;
 
 	if (mac) {
 		memcpy(mac, c.mac, sizeof(c.mac));
 		switch (nmac) {
 		case 5:
 			memcpy(mac + 24, c.nmac3, sizeof(c.nmac3));
 		case 4:
 			memcpy(mac + 18, c.nmac2, sizeof(c.nmac2));
 		case 3:
 			memcpy(mac + 12, c.nmac1, sizeof(c.nmac1));
 		case 2:
 			memcpy(mac + 6,  c.nmac0, sizeof(c.nmac0));
 		}
 	}
 	if (rss_size)
 		*rss_size = G_FW_VI_CMD_RSSSIZE(be16_to_cpu(c.norss_rsssize));
 	return G_FW_VI_CMD_VIID(be16_to_cpu(c.type_to_viid));
 }
 
 /**
  *      t4_alloc_vi - allocate an [Ethernet Function] virtual interface
  *      @adap: the adapter
  *      @mbox: mailbox to use for the FW command
  *      @port: physical port associated with the VI
  *      @pf: the PF owning the VI
  *      @vf: the VF owning the VI
  *      @nmac: number of MAC addresses needed (1 to 5)
  *      @mac: the MAC addresses of the VI
  *      @rss_size: size of RSS table slice associated with this VI
  *
  *	backwards compatible and convieniance routine to allocate a Virtual
  *	Interface with a Ethernet Port Application Function and Intrustion
  *	Detection System disabled.
  */
 int t4_alloc_vi(struct adapter *adap, unsigned int mbox, unsigned int port,
 		unsigned int pf, unsigned int vf, unsigned int nmac, u8 *mac,
 		u16 *rss_size)
 {
 	return t4_alloc_vi_func(adap, mbox, port, pf, vf, nmac, mac, rss_size,
 				FW_VI_FUNC_ETH, 0);
 }
 
 /**
  * 	t4_free_vi - free a virtual interface
  * 	@adap: the adapter
  * 	@mbox: mailbox to use for the FW command
  * 	@pf: the PF owning the VI
  * 	@vf: the VF owning the VI
  * 	@viid: virtual interface identifiler
  *
  * 	Free a previously allocated virtual interface.
  */
 int t4_free_vi(struct adapter *adap, unsigned int mbox, unsigned int pf,
 	       unsigned int vf, unsigned int viid)
 {
 	struct fw_vi_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_VI_CMD) |
 				  F_FW_CMD_REQUEST |
 				  F_FW_CMD_EXEC |
 				  V_FW_VI_CMD_PFN(pf) |
 				  V_FW_VI_CMD_VFN(vf));
 	c.alloc_to_len16 = cpu_to_be32(F_FW_VI_CMD_FREE | FW_LEN16(c));
 	c.type_to_viid = cpu_to_be16(V_FW_VI_CMD_VIID(viid));
 
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
 }
 
 /**
  *	t4_set_rxmode - set Rx properties of a virtual interface
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@viid: the VI id
  *	@mtu: the new MTU or -1
  *	@promisc: 1 to enable promiscuous mode, 0 to disable it, -1 no change
  *	@all_multi: 1 to enable all-multi mode, 0 to disable it, -1 no change
  *	@bcast: 1 to enable broadcast Rx, 0 to disable it, -1 no change
  *	@vlanex: 1 to enable HW VLAN extraction, 0 to disable it, -1 no change
  *	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Sets Rx properties of a virtual interface.
  */
 int t4_set_rxmode(struct adapter *adap, unsigned int mbox, unsigned int viid,
 		  int mtu, int promisc, int all_multi, int bcast, int vlanex,
 		  bool sleep_ok)
 {
 	struct fw_vi_rxmode_cmd c;
 
 	/* convert to FW values */
 	if (mtu < 0)
 		mtu = M_FW_VI_RXMODE_CMD_MTU;
 	if (promisc < 0)
 		promisc = M_FW_VI_RXMODE_CMD_PROMISCEN;
 	if (all_multi < 0)
 		all_multi = M_FW_VI_RXMODE_CMD_ALLMULTIEN;
 	if (bcast < 0)
 		bcast = M_FW_VI_RXMODE_CMD_BROADCASTEN;
 	if (vlanex < 0)
 		vlanex = M_FW_VI_RXMODE_CMD_VLANEXEN;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_viid = cpu_to_be32(V_FW_CMD_OP(FW_VI_RXMODE_CMD) |
 				   F_FW_CMD_REQUEST | F_FW_CMD_WRITE |
 				   V_FW_VI_RXMODE_CMD_VIID(viid));
 	c.retval_len16 = cpu_to_be32(FW_LEN16(c));
 	c.mtu_to_vlanexen =
 		cpu_to_be32(V_FW_VI_RXMODE_CMD_MTU(mtu) |
 			    V_FW_VI_RXMODE_CMD_PROMISCEN(promisc) |
 			    V_FW_VI_RXMODE_CMD_ALLMULTIEN(all_multi) |
 			    V_FW_VI_RXMODE_CMD_BROADCASTEN(bcast) |
 			    V_FW_VI_RXMODE_CMD_VLANEXEN(vlanex));
 	return t4_wr_mbox_meat(adap, mbox, &c, sizeof(c), NULL, sleep_ok);
 }
 
 /**
  *	t4_alloc_mac_filt - allocates exact-match filters for MAC addresses
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@viid: the VI id
  *	@free: if true any existing filters for this VI id are first removed
  *	@naddr: the number of MAC addresses to allocate filters for (up to 7)
  *	@addr: the MAC address(es)
  *	@idx: where to store the index of each allocated filter
  *	@hash: pointer to hash address filter bitmap
  *	@sleep_ok: call is allowed to sleep
  *
  *	Allocates an exact-match filter for each of the supplied addresses and
  *	sets it to the corresponding address.  If @idx is not %NULL it should
  *	have at least @naddr entries, each of which will be set to the index of
  *	the filter allocated for the corresponding MAC address.  If a filter
  *	could not be allocated for an address its index is set to 0xffff.
  *	If @hash is not %NULL addresses that fail to allocate an exact filter
  *	are hashed and update the hash filter bitmap pointed at by @hash.
  *
  *	Returns a negative error number or the number of filters allocated.
  */
 int t4_alloc_mac_filt(struct adapter *adap, unsigned int mbox,
 		      unsigned int viid, bool free, unsigned int naddr,
 		      const u8 **addr, u16 *idx, u64 *hash, bool sleep_ok)
 {
 	int offset, ret = 0;
 	struct fw_vi_mac_cmd c;
 	unsigned int nfilters = 0;
 	unsigned int max_naddr = adap->chip_params->mps_tcam_size;
 	unsigned int rem = naddr;
 
 	if (naddr > max_naddr)
 		return -EINVAL;
 
 	for (offset = 0; offset < naddr ; /**/) {
 		unsigned int fw_naddr = (rem < ARRAY_SIZE(c.u.exact)
 					 ? rem
 					 : ARRAY_SIZE(c.u.exact));
 		size_t len16 = DIV_ROUND_UP(offsetof(struct fw_vi_mac_cmd,
 						     u.exact[fw_naddr]), 16);
 		struct fw_vi_mac_exact *p;
 		int i;
 
 		memset(&c, 0, sizeof(c));
 		c.op_to_viid = cpu_to_be32(V_FW_CMD_OP(FW_VI_MAC_CMD) |
 					   F_FW_CMD_REQUEST |
 					   F_FW_CMD_WRITE |
 					   V_FW_CMD_EXEC(free) |
 					   V_FW_VI_MAC_CMD_VIID(viid));
 		c.freemacs_to_len16 = cpu_to_be32(V_FW_VI_MAC_CMD_FREEMACS(free) |
 						  V_FW_CMD_LEN16(len16));
 
 		for (i = 0, p = c.u.exact; i < fw_naddr; i++, p++) {
 			p->valid_to_idx =
 				cpu_to_be16(F_FW_VI_MAC_CMD_VALID |
 					    V_FW_VI_MAC_CMD_IDX(FW_VI_MAC_ADD_MAC));
 			memcpy(p->macaddr, addr[offset+i], sizeof(p->macaddr));
 		}
 
 		/*
 		 * It's okay if we run out of space in our MAC address arena.
 		 * Some of the addresses we submit may get stored so we need
 		 * to run through the reply to see what the results were ...
 		 */
 		ret = t4_wr_mbox_meat(adap, mbox, &c, sizeof(c), &c, sleep_ok);
 		if (ret && ret != -FW_ENOMEM)
 			break;
 
 		for (i = 0, p = c.u.exact; i < fw_naddr; i++, p++) {
 			u16 index = G_FW_VI_MAC_CMD_IDX(
 						be16_to_cpu(p->valid_to_idx));
 
 			if (idx)
 				idx[offset+i] = (index >=  max_naddr
 						 ? 0xffff
 						 : index);
 			if (index < max_naddr)
 				nfilters++;
 			else if (hash)
 				*hash |= (1ULL << hash_mac_addr(addr[offset+i]));
 		}
 
 		free = false;
 		offset += fw_naddr;
 		rem -= fw_naddr;
 	}
 
 	if (ret == 0 || ret == -FW_ENOMEM)
 		ret = nfilters;
 	return ret;
 }
 
 /**
  *	t4_change_mac - modifies the exact-match filter for a MAC address
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@viid: the VI id
  *	@idx: index of existing filter for old value of MAC address, or -1
  *	@addr: the new MAC address value
  *	@persist: whether a new MAC allocation should be persistent
  *	@add_smt: if true also add the address to the HW SMT
  *
  *	Modifies an exact-match filter and sets it to the new MAC address if
  *	@idx >= 0, or adds the MAC address to a new filter if @idx < 0.  In the
  *	latter case the address is added persistently if @persist is %true.
  *
  *	Note that in general it is not possible to modify the value of a given
  *	filter so the generic way to modify an address filter is to free the one
  *	being used by the old address value and allocate a new filter for the
  *	new address value.
  *
  *	Returns a negative error number or the index of the filter with the new
  *	MAC value.  Note that this index may differ from @idx.
  */
 int t4_change_mac(struct adapter *adap, unsigned int mbox, unsigned int viid,
 		  int idx, const u8 *addr, bool persist, bool add_smt)
 {
 	int ret, mode;
 	struct fw_vi_mac_cmd c;
 	struct fw_vi_mac_exact *p = c.u.exact;
 	unsigned int max_mac_addr = adap->chip_params->mps_tcam_size;
 
 	if (idx < 0)		/* new allocation */
 		idx = persist ? FW_VI_MAC_ADD_PERSIST_MAC : FW_VI_MAC_ADD_MAC;
 	mode = add_smt ? FW_VI_MAC_SMT_AND_MPSTCAM : FW_VI_MAC_MPS_TCAM_ENTRY;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_viid = cpu_to_be32(V_FW_CMD_OP(FW_VI_MAC_CMD) |
 				   F_FW_CMD_REQUEST | F_FW_CMD_WRITE |
 				   V_FW_VI_MAC_CMD_VIID(viid));
 	c.freemacs_to_len16 = cpu_to_be32(V_FW_CMD_LEN16(1));
 	p->valid_to_idx = cpu_to_be16(F_FW_VI_MAC_CMD_VALID |
 				      V_FW_VI_MAC_CMD_SMAC_RESULT(mode) |
 				      V_FW_VI_MAC_CMD_IDX(idx));
 	memcpy(p->macaddr, addr, sizeof(p->macaddr));
 
 	ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
 	if (ret == 0) {
 		ret = G_FW_VI_MAC_CMD_IDX(be16_to_cpu(p->valid_to_idx));
 		if (ret >= max_mac_addr)
 			ret = -ENOMEM;
 	}
 	return ret;
 }
 
 /**
  *	t4_set_addr_hash - program the MAC inexact-match hash filter
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@viid: the VI id
  *	@ucast: whether the hash filter should also match unicast addresses
  *	@vec: the value to be written to the hash filter
  *	@sleep_ok: call is allowed to sleep
  *
  *	Sets the 64-bit inexact-match hash filter for a virtual interface.
  */
 int t4_set_addr_hash(struct adapter *adap, unsigned int mbox, unsigned int viid,
 		     bool ucast, u64 vec, bool sleep_ok)
 {
 	struct fw_vi_mac_cmd c;
 	u32 val;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_viid = cpu_to_be32(V_FW_CMD_OP(FW_VI_MAC_CMD) |
 				   F_FW_CMD_REQUEST | F_FW_CMD_WRITE |
 				   V_FW_VI_ENABLE_CMD_VIID(viid));
 	val = V_FW_VI_MAC_CMD_ENTRY_TYPE(FW_VI_MAC_TYPE_HASHVEC) |
 	      V_FW_VI_MAC_CMD_HASHUNIEN(ucast) | V_FW_CMD_LEN16(1);
 	c.freemacs_to_len16 = cpu_to_be32(val);
 	c.u.hash.hashvec = cpu_to_be64(vec);
 	return t4_wr_mbox_meat(adap, mbox, &c, sizeof(c), NULL, sleep_ok);
 }
 
 /**
  *      t4_enable_vi_params - enable/disable a virtual interface
  *      @adap: the adapter
  *      @mbox: mailbox to use for the FW command
  *      @viid: the VI id
  *      @rx_en: 1=enable Rx, 0=disable Rx
  *      @tx_en: 1=enable Tx, 0=disable Tx
  *      @dcb_en: 1=enable delivery of Data Center Bridging messages.
  *
  *      Enables/disables a virtual interface.  Note that setting DCB Enable
  *      only makes sense when enabling a Virtual Interface ...
  */
 int t4_enable_vi_params(struct adapter *adap, unsigned int mbox,
 			unsigned int viid, bool rx_en, bool tx_en, bool dcb_en)
 {
 	struct fw_vi_enable_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_viid = cpu_to_be32(V_FW_CMD_OP(FW_VI_ENABLE_CMD) |
 				   F_FW_CMD_REQUEST | F_FW_CMD_EXEC |
 				   V_FW_VI_ENABLE_CMD_VIID(viid));
 	c.ien_to_len16 = cpu_to_be32(V_FW_VI_ENABLE_CMD_IEN(rx_en) |
 				     V_FW_VI_ENABLE_CMD_EEN(tx_en) |
 				     V_FW_VI_ENABLE_CMD_DCB_INFO(dcb_en) |
 				     FW_LEN16(c));
 	return t4_wr_mbox_ns(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_enable_vi - enable/disable a virtual interface
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@viid: the VI id
  *	@rx_en: 1=enable Rx, 0=disable Rx
  *	@tx_en: 1=enable Tx, 0=disable Tx
  *
  *	Enables/disables a virtual interface.  Note that setting DCB Enable
  *	only makes sense when enabling a Virtual Interface ...
  */
 int t4_enable_vi(struct adapter *adap, unsigned int mbox, unsigned int viid,
 		 bool rx_en, bool tx_en)
 {
 	return t4_enable_vi_params(adap, mbox, viid, rx_en, tx_en, 0);
 }
 
 /**
  *	t4_identify_port - identify a VI's port by blinking its LED
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@viid: the VI id
  *	@nblinks: how many times to blink LED at 2.5 Hz
  *
  *	Identifies a VI's port by blinking its LED.
  */
 int t4_identify_port(struct adapter *adap, unsigned int mbox, unsigned int viid,
 		     unsigned int nblinks)
 {
 	struct fw_vi_enable_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_viid = cpu_to_be32(V_FW_CMD_OP(FW_VI_ENABLE_CMD) |
 				   F_FW_CMD_REQUEST | F_FW_CMD_EXEC |
 				   V_FW_VI_ENABLE_CMD_VIID(viid));
 	c.ien_to_len16 = cpu_to_be32(F_FW_VI_ENABLE_CMD_LED | FW_LEN16(c));
 	c.blinkdur = cpu_to_be16(nblinks);
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_iq_stop - stop an ingress queue and its FLs
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@pf: the PF owning the queues
  *	@vf: the VF owning the queues
  *	@iqtype: the ingress queue type (FW_IQ_TYPE_FL_INT_CAP, etc.)
  *	@iqid: ingress queue id
  *	@fl0id: FL0 queue id or 0xffff if no attached FL0
  *	@fl1id: FL1 queue id or 0xffff if no attached FL1
  *
  *	Stops an ingress queue and its associated FLs, if any.  This causes
  *	any current or future data/messages destined for these queues to be
  *	tossed.
  */
 int t4_iq_stop(struct adapter *adap, unsigned int mbox, unsigned int pf,
 	       unsigned int vf, unsigned int iqtype, unsigned int iqid,
 	       unsigned int fl0id, unsigned int fl1id)
 {
 	struct fw_iq_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_IQ_CMD) | F_FW_CMD_REQUEST |
 				  F_FW_CMD_EXEC | V_FW_IQ_CMD_PFN(pf) |
 				  V_FW_IQ_CMD_VFN(vf));
 	c.alloc_to_len16 = cpu_to_be32(F_FW_IQ_CMD_IQSTOP | FW_LEN16(c));
 	c.type_to_iqandstindex = cpu_to_be32(V_FW_IQ_CMD_TYPE(iqtype));
 	c.iqid = cpu_to_be16(iqid);
 	c.fl0id = cpu_to_be16(fl0id);
 	c.fl1id = cpu_to_be16(fl1id);
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_iq_free - free an ingress queue and its FLs
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@pf: the PF owning the queues
  *	@vf: the VF owning the queues
  *	@iqtype: the ingress queue type (FW_IQ_TYPE_FL_INT_CAP, etc.)
  *	@iqid: ingress queue id
  *	@fl0id: FL0 queue id or 0xffff if no attached FL0
  *	@fl1id: FL1 queue id or 0xffff if no attached FL1
  *
  *	Frees an ingress queue and its associated FLs, if any.
  */
 int t4_iq_free(struct adapter *adap, unsigned int mbox, unsigned int pf,
 	       unsigned int vf, unsigned int iqtype, unsigned int iqid,
 	       unsigned int fl0id, unsigned int fl1id)
 {
 	struct fw_iq_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_IQ_CMD) | F_FW_CMD_REQUEST |
 				  F_FW_CMD_EXEC | V_FW_IQ_CMD_PFN(pf) |
 				  V_FW_IQ_CMD_VFN(vf));
 	c.alloc_to_len16 = cpu_to_be32(F_FW_IQ_CMD_FREE | FW_LEN16(c));
 	c.type_to_iqandstindex = cpu_to_be32(V_FW_IQ_CMD_TYPE(iqtype));
 	c.iqid = cpu_to_be16(iqid);
 	c.fl0id = cpu_to_be16(fl0id);
 	c.fl1id = cpu_to_be16(fl1id);
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_eth_eq_free - free an Ethernet egress queue
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@pf: the PF owning the queue
  *	@vf: the VF owning the queue
  *	@eqid: egress queue id
  *
  *	Frees an Ethernet egress queue.
  */
 int t4_eth_eq_free(struct adapter *adap, unsigned int mbox, unsigned int pf,
 		   unsigned int vf, unsigned int eqid)
 {
 	struct fw_eq_eth_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_EQ_ETH_CMD) |
 				  F_FW_CMD_REQUEST | F_FW_CMD_EXEC |
 				  V_FW_EQ_ETH_CMD_PFN(pf) |
 				  V_FW_EQ_ETH_CMD_VFN(vf));
 	c.alloc_to_len16 = cpu_to_be32(F_FW_EQ_ETH_CMD_FREE | FW_LEN16(c));
 	c.eqid_pkd = cpu_to_be32(V_FW_EQ_ETH_CMD_EQID(eqid));
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_ctrl_eq_free - free a control egress queue
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@pf: the PF owning the queue
  *	@vf: the VF owning the queue
  *	@eqid: egress queue id
  *
  *	Frees a control egress queue.
  */
 int t4_ctrl_eq_free(struct adapter *adap, unsigned int mbox, unsigned int pf,
 		    unsigned int vf, unsigned int eqid)
 {
 	struct fw_eq_ctrl_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_EQ_CTRL_CMD) |
 				  F_FW_CMD_REQUEST | F_FW_CMD_EXEC |
 				  V_FW_EQ_CTRL_CMD_PFN(pf) |
 				  V_FW_EQ_CTRL_CMD_VFN(vf));
 	c.alloc_to_len16 = cpu_to_be32(F_FW_EQ_CTRL_CMD_FREE | FW_LEN16(c));
 	c.cmpliqid_eqid = cpu_to_be32(V_FW_EQ_CTRL_CMD_EQID(eqid));
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_ofld_eq_free - free an offload egress queue
  *	@adap: the adapter
  *	@mbox: mailbox to use for the FW command
  *	@pf: the PF owning the queue
  *	@vf: the VF owning the queue
  *	@eqid: egress queue id
  *
  *	Frees a control egress queue.
  */
 int t4_ofld_eq_free(struct adapter *adap, unsigned int mbox, unsigned int pf,
 		    unsigned int vf, unsigned int eqid)
 {
 	struct fw_eq_ofld_cmd c;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_EQ_OFLD_CMD) |
 				  F_FW_CMD_REQUEST | F_FW_CMD_EXEC |
 				  V_FW_EQ_OFLD_CMD_PFN(pf) |
 				  V_FW_EQ_OFLD_CMD_VFN(vf));
 	c.alloc_to_len16 = cpu_to_be32(F_FW_EQ_OFLD_CMD_FREE | FW_LEN16(c));
 	c.eqid_pkd = cpu_to_be32(V_FW_EQ_OFLD_CMD_EQID(eqid));
 	return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
 }
 
 /**
  *	t4_link_down_rc_str - return a string for a Link Down Reason Code
  *	@link_down_rc: Link Down Reason Code
  *
  *	Returns a string representation of the Link Down Reason Code.
  */
 const char *t4_link_down_rc_str(unsigned char link_down_rc)
 {
 	static const char *reason[] = {
 		"Link Down",
 		"Remote Fault",
 		"Auto-negotiation Failure",
 		"Reserved3",
 		"Insufficient Airflow",
 		"Unable To Determine Reason",
 		"No RX Signal Detected",
 		"Reserved7",
 	};
 
 	if (link_down_rc >= ARRAY_SIZE(reason))
 		return "Bad Reason Code";
 
 	return reason[link_down_rc];
 }
 
 /*
  * Return the highest speed set in the port capabilities, in Mb/s.
  */
 unsigned int fwcap_to_speed(uint32_t caps)
 {
 	#define TEST_SPEED_RETURN(__caps_speed, __speed) \
 		do { \
 			if (caps & FW_PORT_CAP32_SPEED_##__caps_speed) \
 				return __speed; \
 		} while (0)
 
 	TEST_SPEED_RETURN(400G, 400000);
 	TEST_SPEED_RETURN(200G, 200000);
 	TEST_SPEED_RETURN(100G, 100000);
 	TEST_SPEED_RETURN(50G,   50000);
 	TEST_SPEED_RETURN(40G,   40000);
 	TEST_SPEED_RETURN(25G,   25000);
 	TEST_SPEED_RETURN(10G,   10000);
 	TEST_SPEED_RETURN(1G,     1000);
 	TEST_SPEED_RETURN(100M,    100);
 
 	#undef TEST_SPEED_RETURN
 
 	return 0;
 }
 
 /*
  * Return the port capabilities bit for the given speed, which is in Mb/s.
  */
 uint32_t speed_to_fwcap(unsigned int speed)
 {
 	#define TEST_SPEED_RETURN(__caps_speed, __speed) \
 		do { \
 			if (speed == __speed) \
 				return FW_PORT_CAP32_SPEED_##__caps_speed; \
 		} while (0)
 
 	TEST_SPEED_RETURN(400G, 400000);
 	TEST_SPEED_RETURN(200G, 200000);
 	TEST_SPEED_RETURN(100G, 100000);
 	TEST_SPEED_RETURN(50G,   50000);
 	TEST_SPEED_RETURN(40G,   40000);
 	TEST_SPEED_RETURN(25G,   25000);
 	TEST_SPEED_RETURN(10G,   10000);
 	TEST_SPEED_RETURN(1G,     1000);
 	TEST_SPEED_RETURN(100M,    100);
 
 	#undef TEST_SPEED_RETURN
 
 	return 0;
 }
 
 /*
  * Return the port capabilities bit for the highest speed in the capabilities.
  */
 uint32_t fwcap_top_speed(uint32_t caps)
 {
 	#define TEST_SPEED_RETURN(__caps_speed) \
 		do { \
 			if (caps & FW_PORT_CAP32_SPEED_##__caps_speed) \
 				return FW_PORT_CAP32_SPEED_##__caps_speed; \
 		} while (0)
 
 	TEST_SPEED_RETURN(400G);
 	TEST_SPEED_RETURN(200G);
 	TEST_SPEED_RETURN(100G);
 	TEST_SPEED_RETURN(50G);
 	TEST_SPEED_RETURN(40G);
 	TEST_SPEED_RETURN(25G);
 	TEST_SPEED_RETURN(10G);
 	TEST_SPEED_RETURN(1G);
 	TEST_SPEED_RETURN(100M);
 
 	#undef TEST_SPEED_RETURN
 
 	return 0;
 }
 
 
 /**
  *	lstatus_to_fwcap - translate old lstatus to 32-bit Port Capabilities
  *	@lstatus: old FW_PORT_ACTION_GET_PORT_INFO lstatus value
  *
  *	Translates old FW_PORT_ACTION_GET_PORT_INFO lstatus field into new
  *	32-bit Port Capabilities value.
  */
 static uint32_t lstatus_to_fwcap(u32 lstatus)
 {
 	uint32_t linkattr = 0;
 
 	/*
 	 * Unfortunately the format of the Link Status in the old
 	 * 16-bit Port Information message isn't the same as the
 	 * 16-bit Port Capabilities bitfield used everywhere else ...
 	 */
 	if (lstatus & F_FW_PORT_CMD_RXPAUSE)
 		linkattr |= FW_PORT_CAP32_FC_RX;
 	if (lstatus & F_FW_PORT_CMD_TXPAUSE)
 		linkattr |= FW_PORT_CAP32_FC_TX;
 	if (lstatus & V_FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_100M))
 		linkattr |= FW_PORT_CAP32_SPEED_100M;
 	if (lstatus & V_FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_1G))
 		linkattr |= FW_PORT_CAP32_SPEED_1G;
 	if (lstatus & V_FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_10G))
 		linkattr |= FW_PORT_CAP32_SPEED_10G;
 	if (lstatus & V_FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_25G))
 		linkattr |= FW_PORT_CAP32_SPEED_25G;
 	if (lstatus & V_FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_40G))
 		linkattr |= FW_PORT_CAP32_SPEED_40G;
 	if (lstatus & V_FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_100G))
 		linkattr |= FW_PORT_CAP32_SPEED_100G;
 
 	return linkattr;
 }
 
 /*
  * Updates all fields owned by the common code in port_info and link_config
  * based on information provided by the firmware.  Does not touch any
  * requested_* field.
  */
 static void handle_port_info(struct port_info *pi, const struct fw_port_cmd *p,
     enum fw_port_action action, bool *mod_changed, bool *link_changed)
 {
 	struct link_config old_lc, *lc = &pi->link_cfg;
 	unsigned char fc, fec;
 	u32 stat, linkattr;
 	int old_ptype, old_mtype;
 
 	old_ptype = pi->port_type;
 	old_mtype = pi->mod_type;
 	old_lc = *lc;
 	if (action == FW_PORT_ACTION_GET_PORT_INFO) {
 		stat = be32_to_cpu(p->u.info.lstatus_to_modtype);
 
 		pi->port_type = G_FW_PORT_CMD_PTYPE(stat);
 		pi->mod_type = G_FW_PORT_CMD_MODTYPE(stat);
 		pi->mdio_addr = stat & F_FW_PORT_CMD_MDIOCAP ?
 		    G_FW_PORT_CMD_MDIOADDR(stat) : -1;
 
 		lc->supported = fwcaps16_to_caps32(be16_to_cpu(p->u.info.pcap));
 		lc->advertising = fwcaps16_to_caps32(be16_to_cpu(p->u.info.acap));
 		lc->lp_advertising = fwcaps16_to_caps32(be16_to_cpu(p->u.info.lpacap));
 		lc->link_ok = (stat & F_FW_PORT_CMD_LSTATUS) != 0;
 		lc->link_down_rc = G_FW_PORT_CMD_LINKDNRC(stat);
 
 		linkattr = lstatus_to_fwcap(stat);
 	} else if (action == FW_PORT_ACTION_GET_PORT_INFO32) {
 		stat = be32_to_cpu(p->u.info32.lstatus32_to_cbllen32);
 
 		pi->port_type = G_FW_PORT_CMD_PORTTYPE32(stat);
 		pi->mod_type = G_FW_PORT_CMD_MODTYPE32(stat);
 		pi->mdio_addr = stat & F_FW_PORT_CMD_MDIOCAP32 ?
 		    G_FW_PORT_CMD_MDIOADDR32(stat) : -1;
 
 		lc->supported = be32_to_cpu(p->u.info32.pcaps32);
 		lc->advertising = be32_to_cpu(p->u.info32.acaps32);
 		lc->lp_advertising = be16_to_cpu(p->u.info32.lpacaps32);
 		lc->link_ok = (stat & F_FW_PORT_CMD_LSTATUS32) != 0;
 		lc->link_down_rc = G_FW_PORT_CMD_LINKDNRC32(stat);
 
 		linkattr = be32_to_cpu(p->u.info32.linkattr32);
 	} else {
 		CH_ERR(pi->adapter, "bad port_info action 0x%x\n", action);
 		return;
 	}
 
 	lc->speed = fwcap_to_speed(linkattr);
 
 	fc = 0;
 	if (linkattr & FW_PORT_CAP32_FC_RX)
 		fc |= PAUSE_RX;
 	if (linkattr & FW_PORT_CAP32_FC_TX)
 		fc |= PAUSE_TX;
 	lc->fc = fc;
 
 	fec = FEC_NONE;
 	if (linkattr & FW_PORT_CAP32_FEC_RS)
 		fec |= FEC_RS;
 	if (linkattr & FW_PORT_CAP32_FEC_BASER_RS)
 		fec |= FEC_BASER_RS;
 	lc->fec = fec;
 
 	if (mod_changed != NULL)
 		*mod_changed = false;
 	if (link_changed != NULL)
 		*link_changed = false;
 	if (old_ptype != pi->port_type || old_mtype != pi->mod_type ||
 	    old_lc.supported != lc->supported) {
 		if (pi->mod_type != FW_PORT_MOD_TYPE_NONE) {
 			lc->fec_hint = lc->advertising &
 			    V_FW_PORT_CAP32_FEC(M_FW_PORT_CAP32_FEC);
 		}
 		if (mod_changed != NULL)
 			*mod_changed = true;
 	}
 	if (old_lc.link_ok != lc->link_ok || old_lc.speed != lc->speed ||
 	    old_lc.fec != lc->fec || old_lc.fc != lc->fc) {
 		if (link_changed != NULL)
 			*link_changed = true;
 	}
 }
 
 /**
  *	t4_update_port_info - retrieve and update port information if changed
  *	@pi: the port_info
  *
  *	We issue a Get Port Information Command to the Firmware and, if
  *	successful, we check to see if anything is different from what we
  *	last recorded and update things accordingly.
  */
  int t4_update_port_info(struct port_info *pi)
  {
 	struct adapter *sc = pi->adapter;
 	struct fw_port_cmd cmd;
 	enum fw_port_action action;
 	int ret;
 
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.op_to_portid = cpu_to_be32(V_FW_CMD_OP(FW_PORT_CMD) |
 	    F_FW_CMD_REQUEST | F_FW_CMD_READ |
 	    V_FW_PORT_CMD_PORTID(pi->tx_chan));
 	action = sc->params.port_caps32 ? FW_PORT_ACTION_GET_PORT_INFO32 :
 	    FW_PORT_ACTION_GET_PORT_INFO;
 	cmd.action_to_len16 = cpu_to_be32(V_FW_PORT_CMD_ACTION(action) |
 	    FW_LEN16(cmd));
 	ret = t4_wr_mbox_ns(sc, sc->mbox, &cmd, sizeof(cmd), &cmd);
 	if (ret)
 		return ret;
 
 	handle_port_info(pi, &cmd, action, NULL, NULL);
 	return 0;
 }
 
 /**
  *	t4_handle_fw_rpl - process a FW reply message
  *	@adap: the adapter
  *	@rpl: start of the FW message
  *
  *	Processes a FW message, such as link state change messages.
  */
 int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl)
 {
 	u8 opcode = *(const u8 *)rpl;
 	const struct fw_port_cmd *p = (const void *)rpl;
 	enum fw_port_action action =
 	    G_FW_PORT_CMD_ACTION(be32_to_cpu(p->action_to_len16));
 	bool mod_changed, link_changed;
 
 	if (opcode == FW_PORT_CMD &&
 	    (action == FW_PORT_ACTION_GET_PORT_INFO ||
 	    action == FW_PORT_ACTION_GET_PORT_INFO32)) {
 		/* link/module state change message */
 		int i;
 		int chan = G_FW_PORT_CMD_PORTID(be32_to_cpu(p->op_to_portid));
 		struct port_info *pi = NULL;
 		struct link_config *lc;
 
 		for_each_port(adap, i) {
 			pi = adap2pinfo(adap, i);
 			if (pi->tx_chan == chan)
 				break;
 		}
 
 		lc = &pi->link_cfg;
 		PORT_LOCK(pi);
 		handle_port_info(pi, p, action, &mod_changed, &link_changed);
 		PORT_UNLOCK(pi);
 		if (mod_changed)
 			t4_os_portmod_changed(pi);
 		if (link_changed) {
 			PORT_LOCK(pi);
 			t4_os_link_changed(pi);
 			PORT_UNLOCK(pi);
 		}
 	} else {
 		CH_WARN_RATELIMIT(adap, "Unknown firmware reply %d\n", opcode);
 		return -EINVAL;
 	}
 	return 0;
 }
 
 /**
  *	get_pci_mode - determine a card's PCI mode
  *	@adapter: the adapter
  *	@p: where to store the PCI settings
  *
  *	Determines a card's PCI mode and associated parameters, such as speed
  *	and width.
  */
 static void get_pci_mode(struct adapter *adapter,
 				   struct pci_params *p)
 {
 	u16 val;
 	u32 pcie_cap;
 
 	pcie_cap = t4_os_find_pci_capability(adapter, PCI_CAP_ID_EXP);
 	if (pcie_cap) {
 		t4_os_pci_read_cfg2(adapter, pcie_cap + PCI_EXP_LNKSTA, &val);
 		p->speed = val & PCI_EXP_LNKSTA_CLS;
 		p->width = (val & PCI_EXP_LNKSTA_NLW) >> 4;
 	}
 }
 
 struct flash_desc {
 	u32 vendor_and_model_id;
 	u32 size_mb;
 };
 
 int t4_get_flash_params(struct adapter *adapter)
 {
 	/*
 	 * Table for non-standard supported Flash parts.  Note, all Flash
 	 * parts must have 64KB sectors.
 	 */
 	static struct flash_desc supported_flash[] = {
 		{ 0x00150201, 4 << 20 },	/* Spansion 4MB S25FL032P */
 	};
 
 	int ret;
 	u32 flashid = 0;
 	unsigned int part, manufacturer;
 	unsigned int density, size = 0;
 
 
 	/*
 	 * Issue a Read ID Command to the Flash part.  We decode supported
 	 * Flash parts and their sizes from this.  There's a newer Query
 	 * Command which can retrieve detailed geometry information but many
 	 * Flash parts don't support it.
 	 */
 	ret = sf1_write(adapter, 1, 1, 0, SF_RD_ID);
 	if (!ret)
 		ret = sf1_read(adapter, 3, 0, 1, &flashid);
 	t4_write_reg(adapter, A_SF_OP, 0);	/* unlock SF */
 	if (ret < 0)
 		return ret;
 
 	/*
 	 * Check to see if it's one of our non-standard supported Flash parts.
 	 */
 	for (part = 0; part < ARRAY_SIZE(supported_flash); part++)
 		if (supported_flash[part].vendor_and_model_id == flashid) {
 			adapter->params.sf_size =
 				supported_flash[part].size_mb;
 			adapter->params.sf_nsec =
 				adapter->params.sf_size / SF_SEC_SIZE;
 			goto found;
 		}
 
 	/*
 	 * Decode Flash part size.  The code below looks repetative with
 	 * common encodings, but that's not guaranteed in the JEDEC
 	 * specification for the Read JADEC ID command.  The only thing that
 	 * we're guaranteed by the JADEC specification is where the
 	 * Manufacturer ID is in the returned result.  After that each
 	 * Manufacturer ~could~ encode things completely differently.
 	 * Note, all Flash parts must have 64KB sectors.
 	 */
 	manufacturer = flashid & 0xff;
 	switch (manufacturer) {
 	case 0x20: /* Micron/Numonix */
 		/*
 		 * This Density -> Size decoding table is taken from Micron
 		 * Data Sheets.
 		 */
 		density = (flashid >> 16) & 0xff;
 		switch (density) {
 		case 0x14: size = 1 << 20; break; /*   1MB */
 		case 0x15: size = 1 << 21; break; /*   2MB */
 		case 0x16: size = 1 << 22; break; /*   4MB */
 		case 0x17: size = 1 << 23; break; /*   8MB */
 		case 0x18: size = 1 << 24; break; /*  16MB */
 		case 0x19: size = 1 << 25; break; /*  32MB */
 		case 0x20: size = 1 << 26; break; /*  64MB */
 		case 0x21: size = 1 << 27; break; /* 128MB */
 		case 0x22: size = 1 << 28; break; /* 256MB */
 		}
 		break;
 
 	case 0x9d: /* ISSI -- Integrated Silicon Solution, Inc. */
 		/*
 		 * This Density -> Size decoding table is taken from ISSI
 		 * Data Sheets.
 		 */
 		density = (flashid >> 16) & 0xff;
 		switch (density) {
 		case 0x16: size = 1 << 25; break; /*  32MB */
 		case 0x17: size = 1 << 26; break; /*  64MB */
 		}
 		break;
 
 	case 0xc2: /* Macronix */
 		/*
 		 * This Density -> Size decoding table is taken from Macronix
 		 * Data Sheets.
 		 */
 		density = (flashid >> 16) & 0xff;
 		switch (density) {
 		case 0x17: size = 1 << 23; break; /*   8MB */
 		case 0x18: size = 1 << 24; break; /*  16MB */
 		}
 		break;
 
 	case 0xef: /* Winbond */
 		/*
 		 * This Density -> Size decoding table is taken from Winbond
 		 * Data Sheets.
 		 */
 		density = (flashid >> 16) & 0xff;
 		switch (density) {
 		case 0x17: size = 1 << 23; break; /*   8MB */
 		case 0x18: size = 1 << 24; break; /*  16MB */
 		}
 		break;
 	}
 
 	/* If we didn't recognize the FLASH part, that's no real issue: the
 	 * Hardware/Software contract says that Hardware will _*ALWAYS*_
 	 * use a FLASH part which is at least 4MB in size and has 64KB
 	 * sectors.  The unrecognized FLASH part is likely to be much larger
 	 * than 4MB, but that's all we really need.
 	 */
 	if (size == 0) {
 		CH_WARN(adapter, "Unknown Flash Part, ID = %#x, assuming 4MB\n", flashid);
 		size = 1 << 22;
 	}
 
 	/*
 	 * Store decoded Flash size and fall through into vetting code.
 	 */
 	adapter->params.sf_size = size;
 	adapter->params.sf_nsec = size / SF_SEC_SIZE;
 
  found:
 	/*
 	 * We should ~probably~ reject adapters with FLASHes which are too
 	 * small but we have some legacy FPGAs with small FLASHes that we'd
 	 * still like to use.  So instead we emit a scary message ...
 	 */
 	if (adapter->params.sf_size < FLASH_MIN_SIZE)
 		CH_WARN(adapter, "WARNING: Flash Part ID %#x, size %#x < %#x\n",
 			flashid, adapter->params.sf_size, FLASH_MIN_SIZE);
 
 	return 0;
 }
 
 static void set_pcie_completion_timeout(struct adapter *adapter,
 						  u8 range)
 {
 	u16 val;
 	u32 pcie_cap;
 
 	pcie_cap = t4_os_find_pci_capability(adapter, PCI_CAP_ID_EXP);
 	if (pcie_cap) {
 		t4_os_pci_read_cfg2(adapter, pcie_cap + PCI_EXP_DEVCTL2, &val);
 		val &= 0xfff0;
 		val |= range ;
 		t4_os_pci_write_cfg2(adapter, pcie_cap + PCI_EXP_DEVCTL2, val);
 	}
 }
 
 const struct chip_params *t4_get_chip_params(int chipid)
 {
 	static const struct chip_params chip_params[] = {
 		{
 			/* T4 */
 			.nchan = NCHAN,
 			.pm_stats_cnt = PM_NSTATS,
 			.cng_ch_bits_log = 2,
 			.nsched_cls = 15,
 			.cim_num_obq = CIM_NUM_OBQ,
 			.mps_rplc_size = 128,
 			.vfcount = 128,
 			.sge_fl_db = F_DBPRIO,
 			.mps_tcam_size = NUM_MPS_CLS_SRAM_L_INSTANCES,
 		},
 		{
 			/* T5 */
 			.nchan = NCHAN,
 			.pm_stats_cnt = PM_NSTATS,
 			.cng_ch_bits_log = 2,
 			.nsched_cls = 16,
 			.cim_num_obq = CIM_NUM_OBQ_T5,
 			.mps_rplc_size = 128,
 			.vfcount = 128,
 			.sge_fl_db = F_DBPRIO | F_DBTYPE,
 			.mps_tcam_size = NUM_MPS_T5_CLS_SRAM_L_INSTANCES,
 		},
 		{
 			/* T6 */
 			.nchan = T6_NCHAN,
 			.pm_stats_cnt = T6_PM_NSTATS,
 			.cng_ch_bits_log = 3,
 			.nsched_cls = 16,
 			.cim_num_obq = CIM_NUM_OBQ_T5,
 			.mps_rplc_size = 256,
 			.vfcount = 256,
 			.sge_fl_db = 0,
 			.mps_tcam_size = NUM_MPS_T5_CLS_SRAM_L_INSTANCES,
 		},
 	};
 
 	chipid -= CHELSIO_T4;
 	if (chipid < 0 || chipid >= ARRAY_SIZE(chip_params))
 		return NULL;
 
 	return &chip_params[chipid];
 }
 
 /**
  *	t4_prep_adapter - prepare SW and HW for operation
  *	@adapter: the adapter
  *	@buf: temporary space of at least VPD_LEN size provided by the caller.
  *
  *	Initialize adapter SW state for the various HW modules, set initial
  *	values for some adapter tunables, take PHYs out of reset, and
  *	initialize the MDIO interface.
  */
 int t4_prep_adapter(struct adapter *adapter, u32 *buf)
 {
 	int ret;
 	uint16_t device_id;
 	uint32_t pl_rev;
 
 	get_pci_mode(adapter, &adapter->params.pci);
 
 	pl_rev = t4_read_reg(adapter, A_PL_REV);
 	adapter->params.chipid = G_CHIPID(pl_rev);
 	adapter->params.rev = G_REV(pl_rev);
 	if (adapter->params.chipid == 0) {
 		/* T4 did not have chipid in PL_REV (T5 onwards do) */
 		adapter->params.chipid = CHELSIO_T4;
 
 		/* T4A1 chip is not supported */
 		if (adapter->params.rev == 1) {
 			CH_ALERT(adapter, "T4 rev 1 chip is not supported.\n");
 			return -EINVAL;
 		}
 	}
 
 	adapter->chip_params = t4_get_chip_params(chip_id(adapter));
 	if (adapter->chip_params == NULL)
 		return -EINVAL;
 
 	adapter->params.pci.vpd_cap_addr =
 	    t4_os_find_pci_capability(adapter, PCI_CAP_ID_VPD);
 
 	ret = t4_get_flash_params(adapter);
 	if (ret < 0)
 		return ret;
 
 	/* Cards with real ASICs have the chipid in the PCIe device id */
 	t4_os_pci_read_cfg2(adapter, PCI_DEVICE_ID, &device_id);
 	if (device_id >> 12 == chip_id(adapter))
 		adapter->params.cim_la_size = CIMLA_SIZE;
 	else {
 		/* FPGA */
 		adapter->params.fpga = 1;
 		adapter->params.cim_la_size = 2 * CIMLA_SIZE;
 	}
 
 	ret = get_vpd_params(adapter, &adapter->params.vpd, device_id, buf);
 	if (ret < 0)
 		return ret;
 
 	init_cong_ctrl(adapter->params.a_wnd, adapter->params.b_wnd);
 
 	/*
 	 * Default port and clock for debugging in case we can't reach FW.
 	 */
 	adapter->params.nports = 1;
 	adapter->params.portvec = 1;
 	adapter->params.vpd.cclk = 50000;
 
 	/* Set pci completion timeout value to 4 seconds. */
 	set_pcie_completion_timeout(adapter, 0xd);
 	return 0;
 }
 
 /**
  *	t4_shutdown_adapter - shut down adapter, host & wire
  *	@adapter: the adapter
  *
  *	Perform an emergency shutdown of the adapter and stop it from
  *	continuing any further communication on the ports or DMA to the
  *	host.  This is typically used when the adapter and/or firmware
  *	have crashed and we want to prevent any further accidental
  *	communication with the rest of the world.  This will also force
  *	the port Link Status to go down -- if register writes work --
  *	which should help our peers figure out that we're down.
  */
 int t4_shutdown_adapter(struct adapter *adapter)
 {
 	int port;
 
 	t4_intr_disable(adapter);
 	t4_write_reg(adapter, A_DBG_GPIO_EN, 0);
 	for_each_port(adapter, port) {
 		u32 a_port_cfg = is_t4(adapter) ?
 				 PORT_REG(port, A_XGMAC_PORT_CFG) :
 				 T5_PORT_REG(port, A_MAC_PORT_CFG);
 
 		t4_write_reg(adapter, a_port_cfg,
 			     t4_read_reg(adapter, a_port_cfg)
 			     & ~V_SIGNAL_DET(1));
 	}
 	t4_set_reg_field(adapter, A_SGE_CONTROL, F_GLOBALENABLE, 0);
 
 	return 0;
 }
 
 /**
  *	t4_bar2_sge_qregs - return BAR2 SGE Queue register information
  *	@adapter: the adapter
  *	@qid: the Queue ID
  *	@qtype: the Ingress or Egress type for @qid
  *	@user: true if this request is for a user mode queue
  *	@pbar2_qoffset: BAR2 Queue Offset
  *	@pbar2_qid: BAR2 Queue ID or 0 for Queue ID inferred SGE Queues
  *
  *	Returns the BAR2 SGE Queue Registers information associated with the
  *	indicated Absolute Queue ID.  These are passed back in return value
  *	pointers.  @qtype should be T4_BAR2_QTYPE_EGRESS for Egress Queue
  *	and T4_BAR2_QTYPE_INGRESS for Ingress Queues.
  *
  *	This may return an error which indicates that BAR2 SGE Queue
  *	registers aren't available.  If an error is not returned, then the
  *	following values are returned:
  *
  *	  *@pbar2_qoffset: the BAR2 Offset of the @qid Registers
  *	  *@pbar2_qid: the BAR2 SGE Queue ID or 0 of @qid
  *
  *	If the returned BAR2 Queue ID is 0, then BAR2 SGE registers which
  *	require the "Inferred Queue ID" ability may be used.  E.g. the
  *	Write Combining Doorbell Buffer. If the BAR2 Queue ID is not 0,
  *	then these "Inferred Queue ID" register may not be used.
  */
 int t4_bar2_sge_qregs(struct adapter *adapter,
 		      unsigned int qid,
 		      enum t4_bar2_qtype qtype,
 		      int user,
 		      u64 *pbar2_qoffset,
 		      unsigned int *pbar2_qid)
 {
 	unsigned int page_shift, page_size, qpp_shift, qpp_mask;
 	u64 bar2_page_offset, bar2_qoffset;
 	unsigned int bar2_qid, bar2_qid_offset, bar2_qinferred;
 
 	/* T4 doesn't support BAR2 SGE Queue registers for kernel
 	 * mode queues.
 	 */
 	if (!user && is_t4(adapter))
 		return -EINVAL;
 
 	/* Get our SGE Page Size parameters.
 	 */
 	page_shift = adapter->params.sge.page_shift;
 	page_size = 1 << page_shift;
 
 	/* Get the right Queues per Page parameters for our Queue.
 	 */
 	qpp_shift = (qtype == T4_BAR2_QTYPE_EGRESS
 		     ? adapter->params.sge.eq_s_qpp
 		     : adapter->params.sge.iq_s_qpp);
 	qpp_mask = (1 << qpp_shift) - 1;
 
 	/* Calculate the basics of the BAR2 SGE Queue register area:
 	 *  o The BAR2 page the Queue registers will be in.
 	 *  o The BAR2 Queue ID.
 	 *  o The BAR2 Queue ID Offset into the BAR2 page.
 	 */
 	bar2_page_offset = ((u64)(qid >> qpp_shift) << page_shift);
 	bar2_qid = qid & qpp_mask;
 	bar2_qid_offset = bar2_qid * SGE_UDB_SIZE;
 
 	/* If the BAR2 Queue ID Offset is less than the Page Size, then the
 	 * hardware will infer the Absolute Queue ID simply from the writes to
 	 * the BAR2 Queue ID Offset within the BAR2 Page (and we need to use a
 	 * BAR2 Queue ID of 0 for those writes).  Otherwise, we'll simply
 	 * write to the first BAR2 SGE Queue Area within the BAR2 Page with
 	 * the BAR2 Queue ID and the hardware will infer the Absolute Queue ID
 	 * from the BAR2 Page and BAR2 Queue ID.
 	 *
 	 * One important censequence of this is that some BAR2 SGE registers
 	 * have a "Queue ID" field and we can write the BAR2 SGE Queue ID
 	 * there.  But other registers synthesize the SGE Queue ID purely
 	 * from the writes to the registers -- the Write Combined Doorbell
 	 * Buffer is a good example.  These BAR2 SGE Registers are only
 	 * available for those BAR2 SGE Register areas where the SGE Absolute
 	 * Queue ID can be inferred from simple writes.
 	 */
 	bar2_qoffset = bar2_page_offset;
 	bar2_qinferred = (bar2_qid_offset < page_size);
 	if (bar2_qinferred) {
 		bar2_qoffset += bar2_qid_offset;
 		bar2_qid = 0;
 	}
 
 	*pbar2_qoffset = bar2_qoffset;
 	*pbar2_qid = bar2_qid;
 	return 0;
 }
 
 /**
  *	t4_init_devlog_params - initialize adapter->params.devlog
  *	@adap: the adapter
  *	@fw_attach: whether we can talk to the firmware
  *
  *	Initialize various fields of the adapter's Firmware Device Log
  *	Parameters structure.
  */
 int t4_init_devlog_params(struct adapter *adap, int fw_attach)
 {
 	struct devlog_params *dparams = &adap->params.devlog;
 	u32 pf_dparams;
 	unsigned int devlog_meminfo;
 	struct fw_devlog_cmd devlog_cmd;
 	int ret;
 
 	/* If we're dealing with newer firmware, the Device Log Paramerters
 	 * are stored in a designated register which allows us to access the
 	 * Device Log even if we can't talk to the firmware.
 	 */
 	pf_dparams =
 		t4_read_reg(adap, PCIE_FW_REG(A_PCIE_FW_PF, PCIE_FW_PF_DEVLOG));
 	if (pf_dparams) {
 		unsigned int nentries, nentries128;
 
 		dparams->memtype = G_PCIE_FW_PF_DEVLOG_MEMTYPE(pf_dparams);
 		dparams->start = G_PCIE_FW_PF_DEVLOG_ADDR16(pf_dparams) << 4;
 
 		nentries128 = G_PCIE_FW_PF_DEVLOG_NENTRIES128(pf_dparams);
 		nentries = (nentries128 + 1) * 128;
 		dparams->size = nentries * sizeof(struct fw_devlog_e);
 
 		return 0;
 	}
 
 	/*
 	 * For any failing returns ...
 	 */
 	memset(dparams, 0, sizeof *dparams);
 
 	/*
 	 * If we can't talk to the firmware, there's really nothing we can do
 	 * at this point.
 	 */
 	if (!fw_attach)
 		return -ENXIO;
 
 	/* Otherwise, ask the firmware for it's Device Log Parameters.
 	 */
 	memset(&devlog_cmd, 0, sizeof devlog_cmd);
 	devlog_cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_DEVLOG_CMD) |
 					     F_FW_CMD_REQUEST | F_FW_CMD_READ);
 	devlog_cmd.retval_len16 = cpu_to_be32(FW_LEN16(devlog_cmd));
 	ret = t4_wr_mbox(adap, adap->mbox, &devlog_cmd, sizeof(devlog_cmd),
 			 &devlog_cmd);
 	if (ret)
 		return ret;
 
 	devlog_meminfo =
 		be32_to_cpu(devlog_cmd.memtype_devlog_memaddr16_devlog);
 	dparams->memtype = G_FW_DEVLOG_CMD_MEMTYPE_DEVLOG(devlog_meminfo);
 	dparams->start = G_FW_DEVLOG_CMD_MEMADDR16_DEVLOG(devlog_meminfo) << 4;
 	dparams->size = be32_to_cpu(devlog_cmd.memsize_devlog);
 
 	return 0;
 }
 
 /**
  *	t4_init_sge_params - initialize adap->params.sge
  *	@adapter: the adapter
  *
  *	Initialize various fields of the adapter's SGE Parameters structure.
  */
 int t4_init_sge_params(struct adapter *adapter)
 {
 	u32 r;
 	struct sge_params *sp = &adapter->params.sge;
 	unsigned i, tscale = 1;
 
 	r = t4_read_reg(adapter, A_SGE_INGRESS_RX_THRESHOLD);
 	sp->counter_val[0] = G_THRESHOLD_0(r);
 	sp->counter_val[1] = G_THRESHOLD_1(r);
 	sp->counter_val[2] = G_THRESHOLD_2(r);
 	sp->counter_val[3] = G_THRESHOLD_3(r);
 
 	if (chip_id(adapter) >= CHELSIO_T6) {
 		r = t4_read_reg(adapter, A_SGE_ITP_CONTROL);
 		tscale = G_TSCALE(r);
 		if (tscale == 0)
 			tscale = 1;
 		else
 			tscale += 2;
 	}
 
 	r = t4_read_reg(adapter, A_SGE_TIMER_VALUE_0_AND_1);
 	sp->timer_val[0] = core_ticks_to_us(adapter, G_TIMERVALUE0(r)) * tscale;
 	sp->timer_val[1] = core_ticks_to_us(adapter, G_TIMERVALUE1(r)) * tscale;
 	r = t4_read_reg(adapter, A_SGE_TIMER_VALUE_2_AND_3);
 	sp->timer_val[2] = core_ticks_to_us(adapter, G_TIMERVALUE2(r)) * tscale;
 	sp->timer_val[3] = core_ticks_to_us(adapter, G_TIMERVALUE3(r)) * tscale;
 	r = t4_read_reg(adapter, A_SGE_TIMER_VALUE_4_AND_5);
 	sp->timer_val[4] = core_ticks_to_us(adapter, G_TIMERVALUE4(r)) * tscale;
 	sp->timer_val[5] = core_ticks_to_us(adapter, G_TIMERVALUE5(r)) * tscale;
 
 	r = t4_read_reg(adapter, A_SGE_CONM_CTRL);
 	sp->fl_starve_threshold = G_EGRTHRESHOLD(r) * 2 + 1;
 	if (is_t4(adapter))
 		sp->fl_starve_threshold2 = sp->fl_starve_threshold;
 	else if (is_t5(adapter))
 		sp->fl_starve_threshold2 = G_EGRTHRESHOLDPACKING(r) * 2 + 1;
 	else
 		sp->fl_starve_threshold2 = G_T6_EGRTHRESHOLDPACKING(r) * 2 + 1;
 
 	/* egress queues: log2 of # of doorbells per BAR2 page */
 	r = t4_read_reg(adapter, A_SGE_EGRESS_QUEUES_PER_PAGE_PF);
 	r >>= S_QUEUESPERPAGEPF0 +
 	    (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * adapter->pf;
 	sp->eq_s_qpp = r & M_QUEUESPERPAGEPF0;
 
 	/* ingress queues: log2 of # of doorbells per BAR2 page */
 	r = t4_read_reg(adapter, A_SGE_INGRESS_QUEUES_PER_PAGE_PF);
 	r >>= S_QUEUESPERPAGEPF0 +
 	    (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * adapter->pf;
 	sp->iq_s_qpp = r & M_QUEUESPERPAGEPF0;
 
 	r = t4_read_reg(adapter, A_SGE_HOST_PAGE_SIZE);
 	r >>= S_HOSTPAGESIZEPF0 +
 	    (S_HOSTPAGESIZEPF1 - S_HOSTPAGESIZEPF0) * adapter->pf;
 	sp->page_shift = (r & M_HOSTPAGESIZEPF0) + 10;
 
 	r = t4_read_reg(adapter, A_SGE_CONTROL);
 	sp->sge_control = r;
 	sp->spg_len = r & F_EGRSTATUSPAGESIZE ? 128 : 64;
 	sp->fl_pktshift = G_PKTSHIFT(r);
 	if (chip_id(adapter) <= CHELSIO_T5) {
 		sp->pad_boundary = 1 << (G_INGPADBOUNDARY(r) +
 		    X_INGPADBOUNDARY_SHIFT);
 	} else {
 		sp->pad_boundary = 1 << (G_INGPADBOUNDARY(r) +
 		    X_T6_INGPADBOUNDARY_SHIFT);
 	}
 	if (is_t4(adapter))
 		sp->pack_boundary = sp->pad_boundary;
 	else {
 		r = t4_read_reg(adapter, A_SGE_CONTROL2);
 		if (G_INGPACKBOUNDARY(r) == 0)
 			sp->pack_boundary = 16;
 		else
 			sp->pack_boundary = 1 << (G_INGPACKBOUNDARY(r) + 5);
 	}
 	for (i = 0; i < SGE_FLBUF_SIZES; i++)
 		sp->sge_fl_buffer_size[i] = t4_read_reg(adapter,
 		    A_SGE_FL_BUFFER_SIZE0 + (4 * i));
 
 	return 0;
 }
 
 /*
  * Read and cache the adapter's compressed filter mode and ingress config.
  */
 static void read_filter_mode_and_ingress_config(struct adapter *adap,
     bool sleep_ok)
 {
 	uint32_t v;
 	struct tp_params *tpp = &adap->params.tp;
 
 	t4_tp_pio_read(adap, &tpp->vlan_pri_map, 1, A_TP_VLAN_PRI_MAP,
 	    sleep_ok);
 	t4_tp_pio_read(adap, &tpp->ingress_config, 1, A_TP_INGRESS_CONFIG,
 	    sleep_ok);
 
 	/*
 	 * Now that we have TP_VLAN_PRI_MAP cached, we can calculate the field
 	 * shift positions of several elements of the Compressed Filter Tuple
 	 * for this adapter which we need frequently ...
 	 */
 	tpp->fcoe_shift = t4_filter_field_shift(adap, F_FCOE);
 	tpp->port_shift = t4_filter_field_shift(adap, F_PORT);
 	tpp->vnic_shift = t4_filter_field_shift(adap, F_VNIC_ID);
 	tpp->vlan_shift = t4_filter_field_shift(adap, F_VLAN);
 	tpp->tos_shift = t4_filter_field_shift(adap, F_TOS);
 	tpp->protocol_shift = t4_filter_field_shift(adap, F_PROTOCOL);
 	tpp->ethertype_shift = t4_filter_field_shift(adap, F_ETHERTYPE);
 	tpp->macmatch_shift = t4_filter_field_shift(adap, F_MACMATCH);
 	tpp->matchtype_shift = t4_filter_field_shift(adap, F_MPSHITTYPE);
 	tpp->frag_shift = t4_filter_field_shift(adap, F_FRAGMENTATION);
 
 	if (chip_id(adap) > CHELSIO_T4) {
 		v = t4_read_reg(adap, LE_HASH_MASK_GEN_IPV4T5(3));
 		adap->params.tp.hash_filter_mask = v;
 		v = t4_read_reg(adap, LE_HASH_MASK_GEN_IPV4T5(4));
 		adap->params.tp.hash_filter_mask |= (u64)v << 32;
 	}
 }
 
 /**
  *      t4_init_tp_params - initialize adap->params.tp
  *      @adap: the adapter
  *
  *      Initialize various fields of the adapter's TP Parameters structure.
  */
 int t4_init_tp_params(struct adapter *adap, bool sleep_ok)
 {
 	int chan;
 	u32 v;
 	struct tp_params *tpp = &adap->params.tp;
 
 	v = t4_read_reg(adap, A_TP_TIMER_RESOLUTION);
 	tpp->tre = G_TIMERRESOLUTION(v);
 	tpp->dack_re = G_DELAYEDACKRESOLUTION(v);
 
 	/* MODQ_REQ_MAP defaults to setting queues 0-3 to chan 0-3 */
 	for (chan = 0; chan < MAX_NCHAN; chan++)
 		tpp->tx_modq[chan] = chan;
 
 	read_filter_mode_and_ingress_config(adap, sleep_ok);
 
 	/*
 	 * Cache a mask of the bits that represent the error vector portion of
 	 * rx_pkt.err_vec.  T6+ can use a compressed error vector to make room
 	 * for information about outer encapsulation (GENEVE/VXLAN/NVGRE).
 	 */
 	tpp->err_vec_mask = htobe16(0xffff);
 	if (chip_id(adap) > CHELSIO_T5) {
 		v = t4_read_reg(adap, A_TP_OUT_CONFIG);
 		if (v & F_CRXPKTENC) {
 			tpp->err_vec_mask =
 			    htobe16(V_T6_COMPR_RXERR_VEC(M_T6_COMPR_RXERR_VEC));
 		}
 	}
 
 	return 0;
 }
 
 /**
  *      t4_filter_field_shift - calculate filter field shift
  *      @adap: the adapter
  *      @filter_sel: the desired field (from TP_VLAN_PRI_MAP bits)
  *
  *      Return the shift position of a filter field within the Compressed
  *      Filter Tuple.  The filter field is specified via its selection bit
  *      within TP_VLAN_PRI_MAL (filter mode).  E.g. F_VLAN.
  */
 int t4_filter_field_shift(const struct adapter *adap, int filter_sel)
 {
 	unsigned int filter_mode = adap->params.tp.vlan_pri_map;
 	unsigned int sel;
 	int field_shift;
 
 	if ((filter_mode & filter_sel) == 0)
 		return -1;
 
 	for (sel = 1, field_shift = 0; sel < filter_sel; sel <<= 1) {
 		switch (filter_mode & sel) {
 		case F_FCOE:
 			field_shift += W_FT_FCOE;
 			break;
 		case F_PORT:
 			field_shift += W_FT_PORT;
 			break;
 		case F_VNIC_ID:
 			field_shift += W_FT_VNIC_ID;
 			break;
 		case F_VLAN:
 			field_shift += W_FT_VLAN;
 			break;
 		case F_TOS:
 			field_shift += W_FT_TOS;
 			break;
 		case F_PROTOCOL:
 			field_shift += W_FT_PROTOCOL;
 			break;
 		case F_ETHERTYPE:
 			field_shift += W_FT_ETHERTYPE;
 			break;
 		case F_MACMATCH:
 			field_shift += W_FT_MACMATCH;
 			break;
 		case F_MPSHITTYPE:
 			field_shift += W_FT_MPSHITTYPE;
 			break;
 		case F_FRAGMENTATION:
 			field_shift += W_FT_FRAGMENTATION;
 			break;
 		}
 	}
 	return field_shift;
 }
 
 int t4_port_init(struct adapter *adap, int mbox, int pf, int vf, int port_id)
 {
 	u8 addr[6];
 	int ret, i, j;
 	u16 rss_size;
 	struct port_info *p = adap2pinfo(adap, port_id);
 	u32 param, val;
 
 	for (i = 0, j = -1; i <= p->port_id; i++) {
 		do {
 			j++;
 		} while ((adap->params.portvec & (1 << j)) == 0);
 	}
 
 	p->tx_chan = j;
 	p->mps_bg_map = t4_get_mps_bg_map(adap, j);
 	p->rx_e_chan_map = t4_get_rx_e_chan_map(adap, j);
 	p->lport = j;
 
 	if (!(adap->flags & IS_VF) ||
 	    adap->params.vfres.r_caps & FW_CMD_CAP_PORT) {
  		t4_update_port_info(p);
 	}
 
 	ret = t4_alloc_vi(adap, mbox, j, pf, vf, 1, addr, &rss_size);
 	if (ret < 0)
 		return ret;
 
 	p->vi[0].viid = ret;
 	if (chip_id(adap) <= CHELSIO_T5)
 		p->vi[0].smt_idx = (ret & 0x7f) << 1;
 	else
 		p->vi[0].smt_idx = (ret & 0x7f);
 	p->vi[0].rss_size = rss_size;
 	t4_os_set_hw_addr(p, addr);
 
 	param = V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
 	    V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_RSSINFO) |
 	    V_FW_PARAMS_PARAM_YZ(p->vi[0].viid);
 	ret = t4_query_params(adap, mbox, pf, vf, 1, &param, &val);
 	if (ret)
 		p->vi[0].rss_base = 0xffff;
 	else {
 		/* MPASS((val >> 16) == rss_size); */
 		p->vi[0].rss_base = val & 0xffff;
 	}
 
 	return 0;
 }
 
 /**
  *	t4_read_cimq_cfg - read CIM queue configuration
  *	@adap: the adapter
  *	@base: holds the queue base addresses in bytes
  *	@size: holds the queue sizes in bytes
  *	@thres: holds the queue full thresholds in bytes
  *
  *	Returns the current configuration of the CIM queues, starting with
  *	the IBQs, then the OBQs.
  */
 void t4_read_cimq_cfg(struct adapter *adap, u16 *base, u16 *size, u16 *thres)
 {
 	unsigned int i, v;
 	int cim_num_obq = adap->chip_params->cim_num_obq;
 
 	for (i = 0; i < CIM_NUM_IBQ; i++) {
 		t4_write_reg(adap, A_CIM_QUEUE_CONFIG_REF, F_IBQSELECT |
 			     V_QUENUMSELECT(i));
 		v = t4_read_reg(adap, A_CIM_QUEUE_CONFIG_CTRL);
 		/* value is in 256-byte units */
 		*base++ = G_CIMQBASE(v) * 256;
 		*size++ = G_CIMQSIZE(v) * 256;
 		*thres++ = G_QUEFULLTHRSH(v) * 8; /* 8-byte unit */
 	}
 	for (i = 0; i < cim_num_obq; i++) {
 		t4_write_reg(adap, A_CIM_QUEUE_CONFIG_REF, F_OBQSELECT |
 			     V_QUENUMSELECT(i));
 		v = t4_read_reg(adap, A_CIM_QUEUE_CONFIG_CTRL);
 		/* value is in 256-byte units */
 		*base++ = G_CIMQBASE(v) * 256;
 		*size++ = G_CIMQSIZE(v) * 256;
 	}
 }
 
 /**
  *	t4_read_cim_ibq - read the contents of a CIM inbound queue
  *	@adap: the adapter
  *	@qid: the queue index
  *	@data: where to store the queue contents
  *	@n: capacity of @data in 32-bit words
  *
  *	Reads the contents of the selected CIM queue starting at address 0 up
  *	to the capacity of @data.  @n must be a multiple of 4.  Returns < 0 on
  *	error and the number of 32-bit words actually read on success.
  */
 int t4_read_cim_ibq(struct adapter *adap, unsigned int qid, u32 *data, size_t n)
 {
 	int i, err, attempts;
 	unsigned int addr;
 	const unsigned int nwords = CIM_IBQ_SIZE * 4;
 
 	if (qid > 5 || (n & 3))
 		return -EINVAL;
 
 	addr = qid * nwords;
 	if (n > nwords)
 		n = nwords;
 
 	/* It might take 3-10ms before the IBQ debug read access is allowed.
 	 * Wait for 1 Sec with a delay of 1 usec.
 	 */
 	attempts = 1000000;
 
 	for (i = 0; i < n; i++, addr++) {
 		t4_write_reg(adap, A_CIM_IBQ_DBG_CFG, V_IBQDBGADDR(addr) |
 			     F_IBQDBGEN);
 		err = t4_wait_op_done(adap, A_CIM_IBQ_DBG_CFG, F_IBQDBGBUSY, 0,
 				      attempts, 1);
 		if (err)
 			return err;
 		*data++ = t4_read_reg(adap, A_CIM_IBQ_DBG_DATA);
 	}
 	t4_write_reg(adap, A_CIM_IBQ_DBG_CFG, 0);
 	return i;
 }
 
 /**
  *	t4_read_cim_obq - read the contents of a CIM outbound queue
  *	@adap: the adapter
  *	@qid: the queue index
  *	@data: where to store the queue contents
  *	@n: capacity of @data in 32-bit words
  *
  *	Reads the contents of the selected CIM queue starting at address 0 up
  *	to the capacity of @data.  @n must be a multiple of 4.  Returns < 0 on
  *	error and the number of 32-bit words actually read on success.
  */
 int t4_read_cim_obq(struct adapter *adap, unsigned int qid, u32 *data, size_t n)
 {
 	int i, err;
 	unsigned int addr, v, nwords;
 	int cim_num_obq = adap->chip_params->cim_num_obq;
 
 	if ((qid > (cim_num_obq - 1)) || (n & 3))
 		return -EINVAL;
 
 	t4_write_reg(adap, A_CIM_QUEUE_CONFIG_REF, F_OBQSELECT |
 		     V_QUENUMSELECT(qid));
 	v = t4_read_reg(adap, A_CIM_QUEUE_CONFIG_CTRL);
 
 	addr = G_CIMQBASE(v) * 64;    /* muliple of 256 -> muliple of 4 */
 	nwords = G_CIMQSIZE(v) * 64;  /* same */
 	if (n > nwords)
 		n = nwords;
 
 	for (i = 0; i < n; i++, addr++) {
 		t4_write_reg(adap, A_CIM_OBQ_DBG_CFG, V_OBQDBGADDR(addr) |
 			     F_OBQDBGEN);
 		err = t4_wait_op_done(adap, A_CIM_OBQ_DBG_CFG, F_OBQDBGBUSY, 0,
 				      2, 1);
 		if (err)
 			return err;
 		*data++ = t4_read_reg(adap, A_CIM_OBQ_DBG_DATA);
 	}
 	t4_write_reg(adap, A_CIM_OBQ_DBG_CFG, 0);
 	return i;
 }
 
 enum {
 	CIM_QCTL_BASE     = 0,
 	CIM_CTL_BASE      = 0x2000,
 	CIM_PBT_ADDR_BASE = 0x2800,
 	CIM_PBT_LRF_BASE  = 0x3000,
 	CIM_PBT_DATA_BASE = 0x3800
 };
 
 /**
  *	t4_cim_read - read a block from CIM internal address space
  *	@adap: the adapter
  *	@addr: the start address within the CIM address space
  *	@n: number of words to read
  *	@valp: where to store the result
  *
  *	Reads a block of 4-byte words from the CIM intenal address space.
  */
 int t4_cim_read(struct adapter *adap, unsigned int addr, unsigned int n,
 		unsigned int *valp)
 {
 	int ret = 0;
 
 	if (t4_read_reg(adap, A_CIM_HOST_ACC_CTRL) & F_HOSTBUSY)
 		return -EBUSY;
 
 	for ( ; !ret && n--; addr += 4) {
 		t4_write_reg(adap, A_CIM_HOST_ACC_CTRL, addr);
 		ret = t4_wait_op_done(adap, A_CIM_HOST_ACC_CTRL, F_HOSTBUSY,
 				      0, 5, 2);
 		if (!ret)
 			*valp++ = t4_read_reg(adap, A_CIM_HOST_ACC_DATA);
 	}
 	return ret;
 }
 
 /**
  *	t4_cim_write - write a block into CIM internal address space
  *	@adap: the adapter
  *	@addr: the start address within the CIM address space
  *	@n: number of words to write
  *	@valp: set of values to write
  *
  *	Writes a block of 4-byte words into the CIM intenal address space.
  */
 int t4_cim_write(struct adapter *adap, unsigned int addr, unsigned int n,
 		 const unsigned int *valp)
 {
 	int ret = 0;
 
 	if (t4_read_reg(adap, A_CIM_HOST_ACC_CTRL) & F_HOSTBUSY)
 		return -EBUSY;
 
 	for ( ; !ret && n--; addr += 4) {
 		t4_write_reg(adap, A_CIM_HOST_ACC_DATA, *valp++);
 		t4_write_reg(adap, A_CIM_HOST_ACC_CTRL, addr | F_HOSTWRITE);
 		ret = t4_wait_op_done(adap, A_CIM_HOST_ACC_CTRL, F_HOSTBUSY,
 				      0, 5, 2);
 	}
 	return ret;
 }
 
 static int t4_cim_write1(struct adapter *adap, unsigned int addr,
 			 unsigned int val)
 {
 	return t4_cim_write(adap, addr, 1, &val);
 }
 
 /**
  *	t4_cim_ctl_read - read a block from CIM control region
  *	@adap: the adapter
  *	@addr: the start address within the CIM control region
  *	@n: number of words to read
  *	@valp: where to store the result
  *
  *	Reads a block of 4-byte words from the CIM control region.
  */
 int t4_cim_ctl_read(struct adapter *adap, unsigned int addr, unsigned int n,
 		    unsigned int *valp)
 {
 	return t4_cim_read(adap, addr + CIM_CTL_BASE, n, valp);
 }
 
 /**
  *	t4_cim_read_la - read CIM LA capture buffer
  *	@adap: the adapter
  *	@la_buf: where to store the LA data
  *	@wrptr: the HW write pointer within the capture buffer
  *
  *	Reads the contents of the CIM LA buffer with the most recent entry at
  *	the end	of the returned data and with the entry at @wrptr first.
  *	We try to leave the LA in the running state we find it in.
  */
 int t4_cim_read_la(struct adapter *adap, u32 *la_buf, unsigned int *wrptr)
 {
 	int i, ret;
 	unsigned int cfg, val, idx;
 
 	ret = t4_cim_read(adap, A_UP_UP_DBG_LA_CFG, 1, &cfg);
 	if (ret)
 		return ret;
 
 	if (cfg & F_UPDBGLAEN) {	/* LA is running, freeze it */
 		ret = t4_cim_write1(adap, A_UP_UP_DBG_LA_CFG, 0);
 		if (ret)
 			return ret;
 	}
 
 	ret = t4_cim_read(adap, A_UP_UP_DBG_LA_CFG, 1, &val);
 	if (ret)
 		goto restart;
 
 	idx = G_UPDBGLAWRPTR(val);
 	if (wrptr)
 		*wrptr = idx;
 
 	for (i = 0; i < adap->params.cim_la_size; i++) {
 		ret = t4_cim_write1(adap, A_UP_UP_DBG_LA_CFG,
 				    V_UPDBGLARDPTR(idx) | F_UPDBGLARDEN);
 		if (ret)
 			break;
 		ret = t4_cim_read(adap, A_UP_UP_DBG_LA_CFG, 1, &val);
 		if (ret)
 			break;
 		if (val & F_UPDBGLARDEN) {
 			ret = -ETIMEDOUT;
 			break;
 		}
 		ret = t4_cim_read(adap, A_UP_UP_DBG_LA_DATA, 1, &la_buf[i]);
 		if (ret)
 			break;
 
 		/* address can't exceed 0xfff (UpDbgLaRdPtr is of 12-bits) */
 		idx = (idx + 1) & M_UPDBGLARDPTR;
 		/*
 		 * Bits 0-3 of UpDbgLaRdPtr can be between 0000 to 1001 to
 		 * identify the 32-bit portion of the full 312-bit data
 		 */
 		if (is_t6(adap))
 			while ((idx & 0xf) > 9)
 				idx = (idx + 1) % M_UPDBGLARDPTR;
 	}
 restart:
 	if (cfg & F_UPDBGLAEN) {
 		int r = t4_cim_write1(adap, A_UP_UP_DBG_LA_CFG,
 				      cfg & ~F_UPDBGLARDEN);
 		if (!ret)
 			ret = r;
 	}
 	return ret;
 }
 
 /**
  *	t4_tp_read_la - read TP LA capture buffer
  *	@adap: the adapter
  *	@la_buf: where to store the LA data
  *	@wrptr: the HW write pointer within the capture buffer
  *
  *	Reads the contents of the TP LA buffer with the most recent entry at
  *	the end	of the returned data and with the entry at @wrptr first.
  *	We leave the LA in the running state we find it in.
  */
 void t4_tp_read_la(struct adapter *adap, u64 *la_buf, unsigned int *wrptr)
 {
 	bool last_incomplete;
 	unsigned int i, cfg, val, idx;
 
 	cfg = t4_read_reg(adap, A_TP_DBG_LA_CONFIG) & 0xffff;
 	if (cfg & F_DBGLAENABLE)			/* freeze LA */
 		t4_write_reg(adap, A_TP_DBG_LA_CONFIG,
 			     adap->params.tp.la_mask | (cfg ^ F_DBGLAENABLE));
 
 	val = t4_read_reg(adap, A_TP_DBG_LA_CONFIG);
 	idx = G_DBGLAWPTR(val);
 	last_incomplete = G_DBGLAMODE(val) >= 2 && (val & F_DBGLAWHLF) == 0;
 	if (last_incomplete)
 		idx = (idx + 1) & M_DBGLARPTR;
 	if (wrptr)
 		*wrptr = idx;
 
 	val &= 0xffff;
 	val &= ~V_DBGLARPTR(M_DBGLARPTR);
 	val |= adap->params.tp.la_mask;
 
 	for (i = 0; i < TPLA_SIZE; i++) {
 		t4_write_reg(adap, A_TP_DBG_LA_CONFIG, V_DBGLARPTR(idx) | val);
 		la_buf[i] = t4_read_reg64(adap, A_TP_DBG_LA_DATAL);
 		idx = (idx + 1) & M_DBGLARPTR;
 	}
 
 	/* Wipe out last entry if it isn't valid */
 	if (last_incomplete)
 		la_buf[TPLA_SIZE - 1] = ~0ULL;
 
 	if (cfg & F_DBGLAENABLE)		/* restore running state */
 		t4_write_reg(adap, A_TP_DBG_LA_CONFIG,
 			     cfg | adap->params.tp.la_mask);
 }
 
 /*
  * SGE Hung Ingress DMA Warning Threshold time and Warning Repeat Rate (in
  * seconds).  If we find one of the SGE Ingress DMA State Machines in the same
  * state for more than the Warning Threshold then we'll issue a warning about
  * a potential hang.  We'll repeat the warning as the SGE Ingress DMA Channel
  * appears to be hung every Warning Repeat second till the situation clears.
  * If the situation clears, we'll note that as well.
  */
 #define SGE_IDMA_WARN_THRESH 1
 #define SGE_IDMA_WARN_REPEAT 300
 
 /**
  *	t4_idma_monitor_init - initialize SGE Ingress DMA Monitor
  *	@adapter: the adapter
  *	@idma: the adapter IDMA Monitor state
  *
  *	Initialize the state of an SGE Ingress DMA Monitor.
  */
 void t4_idma_monitor_init(struct adapter *adapter,
 			  struct sge_idma_monitor_state *idma)
 {
 	/* Initialize the state variables for detecting an SGE Ingress DMA
 	 * hang.  The SGE has internal counters which count up on each clock
 	 * tick whenever the SGE finds its Ingress DMA State Engines in the
 	 * same state they were on the previous clock tick.  The clock used is
 	 * the Core Clock so we have a limit on the maximum "time" they can
 	 * record; typically a very small number of seconds.  For instance,
 	 * with a 600MHz Core Clock, we can only count up to a bit more than
 	 * 7s.  So we'll synthesize a larger counter in order to not run the
 	 * risk of having the "timers" overflow and give us the flexibility to
 	 * maintain a Hung SGE State Machine of our own which operates across
 	 * a longer time frame.
 	 */
 	idma->idma_1s_thresh = core_ticks_per_usec(adapter) * 1000000; /* 1s */
 	idma->idma_stalled[0] = idma->idma_stalled[1] = 0;
 }
 
 /**
  *	t4_idma_monitor - monitor SGE Ingress DMA state
  *	@adapter: the adapter
  *	@idma: the adapter IDMA Monitor state
  *	@hz: number of ticks/second
  *	@ticks: number of ticks since the last IDMA Monitor call
  */
 void t4_idma_monitor(struct adapter *adapter,
 		     struct sge_idma_monitor_state *idma,
 		     int hz, int ticks)
 {
 	int i, idma_same_state_cnt[2];
 
 	 /* Read the SGE Debug Ingress DMA Same State Count registers.  These
 	  * are counters inside the SGE which count up on each clock when the
 	  * SGE finds its Ingress DMA State Engines in the same states they
 	  * were in the previous clock.  The counters will peg out at
 	  * 0xffffffff without wrapping around so once they pass the 1s
 	  * threshold they'll stay above that till the IDMA state changes.
 	  */
 	t4_write_reg(adapter, A_SGE_DEBUG_INDEX, 13);
 	idma_same_state_cnt[0] = t4_read_reg(adapter, A_SGE_DEBUG_DATA_HIGH);
 	idma_same_state_cnt[1] = t4_read_reg(adapter, A_SGE_DEBUG_DATA_LOW);
 
 	for (i = 0; i < 2; i++) {
 		u32 debug0, debug11;
 
 		/* If the Ingress DMA Same State Counter ("timer") is less
 		 * than 1s, then we can reset our synthesized Stall Timer and
 		 * continue.  If we have previously emitted warnings about a
 		 * potential stalled Ingress Queue, issue a note indicating
 		 * that the Ingress Queue has resumed forward progress.
 		 */
 		if (idma_same_state_cnt[i] < idma->idma_1s_thresh) {
 			if (idma->idma_stalled[i] >= SGE_IDMA_WARN_THRESH*hz)
 				CH_WARN(adapter, "SGE idma%d, queue %u, "
 					"resumed after %d seconds\n",
 					i, idma->idma_qid[i],
 					idma->idma_stalled[i]/hz);
 			idma->idma_stalled[i] = 0;
 			continue;
 		}
 
 		/* Synthesize an SGE Ingress DMA Same State Timer in the Hz
 		 * domain.  The first time we get here it'll be because we
 		 * passed the 1s Threshold; each additional time it'll be
 		 * because the RX Timer Callback is being fired on its regular
 		 * schedule.
 		 *
 		 * If the stall is below our Potential Hung Ingress Queue
 		 * Warning Threshold, continue.
 		 */
 		if (idma->idma_stalled[i] == 0) {
 			idma->idma_stalled[i] = hz;
 			idma->idma_warn[i] = 0;
 		} else {
 			idma->idma_stalled[i] += ticks;
 			idma->idma_warn[i] -= ticks;
 		}
 
 		if (idma->idma_stalled[i] < SGE_IDMA_WARN_THRESH*hz)
 			continue;
 
 		/* We'll issue a warning every SGE_IDMA_WARN_REPEAT seconds.
 		 */
 		if (idma->idma_warn[i] > 0)
 			continue;
 		idma->idma_warn[i] = SGE_IDMA_WARN_REPEAT*hz;
 
 		/* Read and save the SGE IDMA State and Queue ID information.
 		 * We do this every time in case it changes across time ...
 		 * can't be too careful ...
 		 */
 		t4_write_reg(adapter, A_SGE_DEBUG_INDEX, 0);
 		debug0 = t4_read_reg(adapter, A_SGE_DEBUG_DATA_LOW);
 		idma->idma_state[i] = (debug0 >> (i * 9)) & 0x3f;
 
 		t4_write_reg(adapter, A_SGE_DEBUG_INDEX, 11);
 		debug11 = t4_read_reg(adapter, A_SGE_DEBUG_DATA_LOW);
 		idma->idma_qid[i] = (debug11 >> (i * 16)) & 0xffff;
 
 		CH_WARN(adapter, "SGE idma%u, queue %u, potentially stuck in "
 			" state %u for %d seconds (debug0=%#x, debug11=%#x)\n",
 			i, idma->idma_qid[i], idma->idma_state[i],
 			idma->idma_stalled[i]/hz,
 			debug0, debug11);
 		t4_sge_decode_idma_state(adapter, idma->idma_state[i]);
 	}
 }
 
 /**
  *	t4_read_pace_tbl - read the pace table
  *	@adap: the adapter
  *	@pace_vals: holds the returned values
  *
  *	Returns the values of TP's pace table in microseconds.
  */
 void t4_read_pace_tbl(struct adapter *adap, unsigned int pace_vals[NTX_SCHED])
 {
 	unsigned int i, v;
 
 	for (i = 0; i < NTX_SCHED; i++) {
 		t4_write_reg(adap, A_TP_PACE_TABLE, 0xffff0000 + i);
 		v = t4_read_reg(adap, A_TP_PACE_TABLE);
 		pace_vals[i] = dack_ticks_to_usec(adap, v);
 	}
 }
 
 /**
  *	t4_get_tx_sched - get the configuration of a Tx HW traffic scheduler
  *	@adap: the adapter
  *	@sched: the scheduler index
  *	@kbps: the byte rate in Kbps
  *	@ipg: the interpacket delay in tenths of nanoseconds
  *
  *	Return the current configuration of a HW Tx scheduler.
  */
 void t4_get_tx_sched(struct adapter *adap, unsigned int sched, unsigned int *kbps,
 		     unsigned int *ipg, bool sleep_ok)
 {
 	unsigned int v, addr, bpt, cpt;
 
 	if (kbps) {
 		addr = A_TP_TX_MOD_Q1_Q0_RATE_LIMIT - sched / 2;
 		t4_tp_tm_pio_read(adap, &v, 1, addr, sleep_ok);
 		if (sched & 1)
 			v >>= 16;
 		bpt = (v >> 8) & 0xff;
 		cpt = v & 0xff;
 		if (!cpt)
 			*kbps = 0;	/* scheduler disabled */
 		else {
 			v = (adap->params.vpd.cclk * 1000) / cpt; /* ticks/s */
 			*kbps = (v * bpt) / 125;
 		}
 	}
 	if (ipg) {
 		addr = A_TP_TX_MOD_Q1_Q0_TIMER_SEPARATOR - sched / 2;
 		t4_tp_tm_pio_read(adap, &v, 1, addr, sleep_ok);
 		if (sched & 1)
 			v >>= 16;
 		v &= 0xffff;
 		*ipg = (10000 * v) / core_ticks_per_usec(adap);
 	}
 }
 
 /**
  *	t4_load_cfg - download config file
  *	@adap: the adapter
  *	@cfg_data: the cfg text file to write
  *	@size: text file size
  *
  *	Write the supplied config text file to the card's serial flash.
  */
 int t4_load_cfg(struct adapter *adap, const u8 *cfg_data, unsigned int size)
 {
 	int ret, i, n, cfg_addr;
 	unsigned int addr;
 	unsigned int flash_cfg_start_sec;
 	unsigned int sf_sec_size = adap->params.sf_size / adap->params.sf_nsec;
 
 	cfg_addr = t4_flash_cfg_addr(adap);
 	if (cfg_addr < 0)
 		return cfg_addr;
 
 	addr = cfg_addr;
 	flash_cfg_start_sec = addr / SF_SEC_SIZE;
 
 	if (size > FLASH_CFG_MAX_SIZE) {
 		CH_ERR(adap, "cfg file too large, max is %u bytes\n",
 		       FLASH_CFG_MAX_SIZE);
 		return -EFBIG;
 	}
 
 	i = DIV_ROUND_UP(FLASH_CFG_MAX_SIZE,	/* # of sectors spanned */
 			 sf_sec_size);
 	ret = t4_flash_erase_sectors(adap, flash_cfg_start_sec,
 				     flash_cfg_start_sec + i - 1);
 	/*
 	 * If size == 0 then we're simply erasing the FLASH sectors associated
 	 * with the on-adapter Firmware Configuration File.
 	 */
 	if (ret || size == 0)
 		goto out;
 
 	/* this will write to the flash up to SF_PAGE_SIZE at a time */
 	for (i = 0; i< size; i+= SF_PAGE_SIZE) {
 		if ( (size - i) <  SF_PAGE_SIZE)
 			n = size - i;
 		else
 			n = SF_PAGE_SIZE;
 		ret = t4_write_flash(adap, addr, n, cfg_data, 1);
 		if (ret)
 			goto out;
 
 		addr += SF_PAGE_SIZE;
 		cfg_data += SF_PAGE_SIZE;
 	}
 
 out:
 	if (ret)
 		CH_ERR(adap, "config file %s failed %d\n",
 		       (size == 0 ? "clear" : "download"), ret);
 	return ret;
 }
 
 /**
  *	t5_fw_init_extern_mem - initialize the external memory
  *	@adap: the adapter
  *
  *	Initializes the external memory on T5.
  */
 int t5_fw_init_extern_mem(struct adapter *adap)
 {
 	u32 params[1], val[1];
 	int ret;
 
 	if (!is_t5(adap))
 		return 0;
 
 	val[0] = 0xff; /* Initialize all MCs */
 	params[0] = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DEV) |
 			V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DEV_MCINIT));
 	ret = t4_set_params_timeout(adap, adap->mbox, adap->pf, 0, 1, params, val,
 			FW_CMD_MAX_TIMEOUT);
 
 	return ret;
 }
 
 /* BIOS boot headers */
 typedef struct pci_expansion_rom_header {
 	u8	signature[2]; /* ROM Signature. Should be 0xaa55 */
 	u8	reserved[22]; /* Reserved per processor Architecture data */
 	u8	pcir_offset[2]; /* Offset to PCI Data Structure */
 } pci_exp_rom_header_t; /* PCI_EXPANSION_ROM_HEADER */
 
 /* Legacy PCI Expansion ROM Header */
 typedef struct legacy_pci_expansion_rom_header {
 	u8	signature[2]; /* ROM Signature. Should be 0xaa55 */
 	u8	size512; /* Current Image Size in units of 512 bytes */
 	u8	initentry_point[4];
 	u8	cksum; /* Checksum computed on the entire Image */
 	u8	reserved[16]; /* Reserved */
 	u8	pcir_offset[2]; /* Offset to PCI Data Struture */
 } legacy_pci_exp_rom_header_t; /* LEGACY_PCI_EXPANSION_ROM_HEADER */
 
 /* EFI PCI Expansion ROM Header */
 typedef struct efi_pci_expansion_rom_header {
 	u8	signature[2]; // ROM signature. The value 0xaa55
 	u8	initialization_size[2]; /* Units 512. Includes this header */
 	u8	efi_signature[4]; /* Signature from EFI image header. 0x0EF1 */
 	u8	efi_subsystem[2]; /* Subsystem value for EFI image header */
 	u8	efi_machine_type[2]; /* Machine type from EFI image header */
 	u8	compression_type[2]; /* Compression type. */
 		/*
 		 * Compression type definition
 		 * 0x0: uncompressed
 		 * 0x1: Compressed
 		 * 0x2-0xFFFF: Reserved
 		 */
 	u8	reserved[8]; /* Reserved */
 	u8	efi_image_header_offset[2]; /* Offset to EFI Image */
 	u8	pcir_offset[2]; /* Offset to PCI Data Structure */
 } efi_pci_exp_rom_header_t; /* EFI PCI Expansion ROM Header */
 
 /* PCI Data Structure Format */
 typedef struct pcir_data_structure { /* PCI Data Structure */
 	u8	signature[4]; /* Signature. The string "PCIR" */
 	u8	vendor_id[2]; /* Vendor Identification */
 	u8	device_id[2]; /* Device Identification */
 	u8	vital_product[2]; /* Pointer to Vital Product Data */
 	u8	length[2]; /* PCIR Data Structure Length */
 	u8	revision; /* PCIR Data Structure Revision */
 	u8	class_code[3]; /* Class Code */
 	u8	image_length[2]; /* Image Length. Multiple of 512B */
 	u8	code_revision[2]; /* Revision Level of Code/Data */
 	u8	code_type; /* Code Type. */
 		/*
 		 * PCI Expansion ROM Code Types
 		 * 0x00: Intel IA-32, PC-AT compatible. Legacy
 		 * 0x01: Open Firmware standard for PCI. FCODE
 		 * 0x02: Hewlett-Packard PA RISC. HP reserved
 		 * 0x03: EFI Image. EFI
 		 * 0x04-0xFF: Reserved.
 		 */
 	u8	indicator; /* Indicator. Identifies the last image in the ROM */
 	u8	reserved[2]; /* Reserved */
 } pcir_data_t; /* PCI__DATA_STRUCTURE */
 
 /* BOOT constants */
 enum {
 	BOOT_FLASH_BOOT_ADDR = 0x0,/* start address of boot image in flash */
 	BOOT_SIGNATURE = 0xaa55,   /* signature of BIOS boot ROM */
 	BOOT_SIZE_INC = 512,       /* image size measured in 512B chunks */
 	BOOT_MIN_SIZE = sizeof(pci_exp_rom_header_t), /* basic header */
 	BOOT_MAX_SIZE = 1024*BOOT_SIZE_INC, /* 1 byte * length increment  */
 	VENDOR_ID = 0x1425, /* Vendor ID */
 	PCIR_SIGNATURE = 0x52494350 /* PCIR signature */
 };
 
 /*
  *	modify_device_id - Modifies the device ID of the Boot BIOS image
  *	@adatper: the device ID to write.
  *	@boot_data: the boot image to modify.
  *
  *	Write the supplied device ID to the boot BIOS image.
  */
 static void modify_device_id(int device_id, u8 *boot_data)
 {
 	legacy_pci_exp_rom_header_t *header;
 	pcir_data_t *pcir_header;
 	u32 cur_header = 0;
 
 	/*
 	 * Loop through all chained images and change the device ID's
 	 */
 	while (1) {
 		header = (legacy_pci_exp_rom_header_t *) &boot_data[cur_header];
 		pcir_header = (pcir_data_t *) &boot_data[cur_header +
 			      le16_to_cpu(*(u16*)header->pcir_offset)];
 
 		/*
 		 * Only modify the Device ID if code type is Legacy or HP.
 		 * 0x00: Okay to modify
 		 * 0x01: FCODE. Do not be modify
 		 * 0x03: Okay to modify
 		 * 0x04-0xFF: Do not modify
 		 */
 		if (pcir_header->code_type == 0x00) {
 			u8 csum = 0;
 			int i;
 
 			/*
 			 * Modify Device ID to match current adatper
 			 */
 			*(u16*) pcir_header->device_id = device_id;
 
 			/*
 			 * Set checksum temporarily to 0.
 			 * We will recalculate it later.
 			 */
 			header->cksum = 0x0;
 
 			/*
 			 * Calculate and update checksum
 			 */
 			for (i = 0; i < (header->size512 * 512); i++)
 				csum += (u8)boot_data[cur_header + i];
 
 			/*
 			 * Invert summed value to create the checksum
 			 * Writing new checksum value directly to the boot data
 			 */
 			boot_data[cur_header + 7] = -csum;
 
 		} else if (pcir_header->code_type == 0x03) {
 
 			/*
 			 * Modify Device ID to match current adatper
 			 */
 			*(u16*) pcir_header->device_id = device_id;
 
 		}
 
 
 		/*
 		 * Check indicator element to identify if this is the last
 		 * image in the ROM.
 		 */
 		if (pcir_header->indicator & 0x80)
 			break;
 
 		/*
 		 * Move header pointer up to the next image in the ROM.
 		 */
 		cur_header += header->size512 * 512;
 	}
 }
 
 /*
  *	t4_load_boot - download boot flash
  *	@adapter: the adapter
  *	@boot_data: the boot image to write
  *	@boot_addr: offset in flash to write boot_data
  *	@size: image size
  *
  *	Write the supplied boot image to the card's serial flash.
  *	The boot image has the following sections: a 28-byte header and the
  *	boot image.
  */
 int t4_load_boot(struct adapter *adap, u8 *boot_data,
 		 unsigned int boot_addr, unsigned int size)
 {
 	pci_exp_rom_header_t *header;
 	int pcir_offset ;
 	pcir_data_t *pcir_header;
 	int ret, addr;
 	uint16_t device_id;
 	unsigned int i;
 	unsigned int boot_sector = (boot_addr * 1024 );
 	unsigned int sf_sec_size = adap->params.sf_size / adap->params.sf_nsec;
 
 	/*
 	 * Make sure the boot image does not encroach on the firmware region
 	 */
 	if ((boot_sector + size) >> 16 > FLASH_FW_START_SEC) {
 		CH_ERR(adap, "boot image encroaching on firmware region\n");
 		return -EFBIG;
 	}
 
 	/*
 	 * The boot sector is comprised of the Expansion-ROM boot, iSCSI boot,
 	 * and Boot configuration data sections. These 3 boot sections span
 	 * sectors 0 to 7 in flash and live right before the FW image location.
 	 */
 	i = DIV_ROUND_UP(size ? size : FLASH_FW_START,
 			sf_sec_size);
 	ret = t4_flash_erase_sectors(adap, boot_sector >> 16,
 				     (boot_sector >> 16) + i - 1);
 
 	/*
 	 * If size == 0 then we're simply erasing the FLASH sectors associated
 	 * with the on-adapter option ROM file
 	 */
 	if (ret || (size == 0))
 		goto out;
 
 	/* Get boot header */
 	header = (pci_exp_rom_header_t *)boot_data;
 	pcir_offset = le16_to_cpu(*(u16 *)header->pcir_offset);
 	/* PCIR Data Structure */
 	pcir_header = (pcir_data_t *) &boot_data[pcir_offset];
 
 	/*
 	 * Perform some primitive sanity testing to avoid accidentally
 	 * writing garbage over the boot sectors.  We ought to check for
 	 * more but it's not worth it for now ...
 	 */
 	if (size < BOOT_MIN_SIZE || size > BOOT_MAX_SIZE) {
 		CH_ERR(adap, "boot image too small/large\n");
 		return -EFBIG;
 	}
 
 #ifndef CHELSIO_T4_DIAGS
 	/*
 	 * Check BOOT ROM header signature
 	 */
 	if (le16_to_cpu(*(u16*)header->signature) != BOOT_SIGNATURE ) {
 		CH_ERR(adap, "Boot image missing signature\n");
 		return -EINVAL;
 	}
 
 	/*
 	 * Check PCI header signature
 	 */
 	if (le32_to_cpu(*(u32*)pcir_header->signature) != PCIR_SIGNATURE) {
 		CH_ERR(adap, "PCI header missing signature\n");
 		return -EINVAL;
 	}
 
 	/*
 	 * Check Vendor ID matches Chelsio ID
 	 */
 	if (le16_to_cpu(*(u16*)pcir_header->vendor_id) != VENDOR_ID) {
 		CH_ERR(adap, "Vendor ID missing signature\n");
 		return -EINVAL;
 	}
 #endif
 
 	/*
 	 * Retrieve adapter's device ID
 	 */
 	t4_os_pci_read_cfg2(adap, PCI_DEVICE_ID, &device_id);
 	/* Want to deal with PF 0 so I strip off PF 4 indicator */
 	device_id = device_id & 0xf0ff;
 
 	/*
 	 * Check PCIE Device ID
 	 */
 	if (le16_to_cpu(*(u16*)pcir_header->device_id) != device_id) {
 		/*
 		 * Change the device ID in the Boot BIOS image to match
 		 * the Device ID of the current adapter.
 		 */
 		modify_device_id(device_id, boot_data);
 	}
 
 	/*
 	 * Skip over the first SF_PAGE_SIZE worth of data and write it after
 	 * we finish copying the rest of the boot image. This will ensure
 	 * that the BIOS boot header will only be written if the boot image
 	 * was written in full.
 	 */
 	addr = boot_sector;
 	for (size -= SF_PAGE_SIZE; size; size -= SF_PAGE_SIZE) {
 		addr += SF_PAGE_SIZE;
 		boot_data += SF_PAGE_SIZE;
 		ret = t4_write_flash(adap, addr, SF_PAGE_SIZE, boot_data, 0);
 		if (ret)
 			goto out;
 	}
 
 	ret = t4_write_flash(adap, boot_sector, SF_PAGE_SIZE,
 			     (const u8 *)header, 0);
 
 out:
 	if (ret)
 		CH_ERR(adap, "boot image download failed, error %d\n", ret);
 	return ret;
 }
 
 /*
  *	t4_flash_bootcfg_addr - return the address of the flash optionrom configuration
  *	@adapter: the adapter
  *
  *	Return the address within the flash where the OptionROM Configuration
  *	is stored, or an error if the device FLASH is too small to contain
  *	a OptionROM Configuration.
  */
 static int t4_flash_bootcfg_addr(struct adapter *adapter)
 {
 	/*
 	 * If the device FLASH isn't large enough to hold a Firmware
 	 * Configuration File, return an error.
 	 */
 	if (adapter->params.sf_size < FLASH_BOOTCFG_START + FLASH_BOOTCFG_MAX_SIZE)
 		return -ENOSPC;
 
 	return FLASH_BOOTCFG_START;
 }
 
 int t4_load_bootcfg(struct adapter *adap,const u8 *cfg_data, unsigned int size)
 {
 	int ret, i, n, cfg_addr;
 	unsigned int addr;
 	unsigned int flash_cfg_start_sec;
 	unsigned int sf_sec_size = adap->params.sf_size / adap->params.sf_nsec;
 
 	cfg_addr = t4_flash_bootcfg_addr(adap);
 	if (cfg_addr < 0)
 		return cfg_addr;
 
 	addr = cfg_addr;
 	flash_cfg_start_sec = addr / SF_SEC_SIZE;
 
 	if (size > FLASH_BOOTCFG_MAX_SIZE) {
 		CH_ERR(adap, "bootcfg file too large, max is %u bytes\n",
 			FLASH_BOOTCFG_MAX_SIZE);
 		return -EFBIG;
 	}
 
 	i = DIV_ROUND_UP(FLASH_BOOTCFG_MAX_SIZE,/* # of sectors spanned */
 			 sf_sec_size);
 	ret = t4_flash_erase_sectors(adap, flash_cfg_start_sec,
 					flash_cfg_start_sec + i - 1);
 
 	/*
 	 * If size == 0 then we're simply erasing the FLASH sectors associated
 	 * with the on-adapter OptionROM Configuration File.
 	 */
 	if (ret || size == 0)
 		goto out;
 
 	/* this will write to the flash up to SF_PAGE_SIZE at a time */
 	for (i = 0; i< size; i+= SF_PAGE_SIZE) {
 		if ( (size - i) <  SF_PAGE_SIZE)
 			n = size - i;
 		else
 			n = SF_PAGE_SIZE;
 		ret = t4_write_flash(adap, addr, n, cfg_data, 0);
 		if (ret)
 			goto out;
 
 		addr += SF_PAGE_SIZE;
 		cfg_data += SF_PAGE_SIZE;
 	}
 
 out:
 	if (ret)
 		CH_ERR(adap, "boot config data %s failed %d\n",
 				(size == 0 ? "clear" : "download"), ret);
 	return ret;
 }
 
 /**
  *	t4_set_filter_mode - configure the optional components of filter tuples
  *	@adap: the adapter
  *	@mode_map: a bitmap selcting which optional filter components to enable
  * 	@sleep_ok: if true we may sleep while awaiting command completion
  *
  *	Sets the filter mode by selecting the optional components to enable
  *	in filter tuples.  Returns 0 on success and a negative error if the
  *	requested mode needs more bits than are available for optional
  *	components.
  */
 int t4_set_filter_mode(struct adapter *adap, unsigned int mode_map,
 		       bool sleep_ok)
 {
 	static u8 width[] = { 1, 3, 17, 17, 8, 8, 16, 9, 3, 1 };
 
 	int i, nbits = 0;
 
 	for (i = S_FCOE; i <= S_FRAGMENTATION; i++)
 		if (mode_map & (1 << i))
 			nbits += width[i];
 	if (nbits > FILTER_OPT_LEN)
 		return -EINVAL;
 	t4_tp_pio_write(adap, &mode_map, 1, A_TP_VLAN_PRI_MAP, sleep_ok);
 	read_filter_mode_and_ingress_config(adap, sleep_ok);
 
 	return 0;
 }
 
 /**
  *	t4_clr_port_stats - clear port statistics
  *	@adap: the adapter
  *	@idx: the port index
  *
  *	Clear HW statistics for the given port.
  */
 void t4_clr_port_stats(struct adapter *adap, int idx)
 {
 	unsigned int i;
 	u32 bgmap = adap2pinfo(adap, idx)->mps_bg_map;
 	u32 port_base_addr;
 
 	if (is_t4(adap))
 		port_base_addr = PORT_BASE(idx);
 	else
 		port_base_addr = T5_PORT_BASE(idx);
 
 	for (i = A_MPS_PORT_STAT_TX_PORT_BYTES_L;
 			i <= A_MPS_PORT_STAT_TX_PORT_PPP7_H; i += 8)
 		t4_write_reg(adap, port_base_addr + i, 0);
 	for (i = A_MPS_PORT_STAT_RX_PORT_BYTES_L;
 			i <= A_MPS_PORT_STAT_RX_PORT_LESS_64B_H; i += 8)
 		t4_write_reg(adap, port_base_addr + i, 0);
 	for (i = 0; i < 4; i++)
 		if (bgmap & (1 << i)) {
 			t4_write_reg(adap,
 			A_MPS_STAT_RX_BG_0_MAC_DROP_FRAME_L + i * 8, 0);
 			t4_write_reg(adap,
 			A_MPS_STAT_RX_BG_0_MAC_TRUNC_FRAME_L + i * 8, 0);
 		}
 }
 
 /**
  *	t4_i2c_rd - read I2C data from adapter
  *	@adap: the adapter
  *	@port: Port number if per-port device; <0 if not
  *	@devid: per-port device ID or absolute device ID
  *	@offset: byte offset into device I2C space
  *	@len: byte length of I2C space data
  *	@buf: buffer in which to return I2C data
  *
  *	Reads the I2C data from the indicated device and location.
  */
 int t4_i2c_rd(struct adapter *adap, unsigned int mbox,
 	      int port, unsigned int devid,
 	      unsigned int offset, unsigned int len,
 	      u8 *buf)
 {
 	u32 ldst_addrspace;
 	struct fw_ldst_cmd ldst;
 	int ret;
 
 	if (port >= 4 ||
 	    devid >= 256 ||
 	    offset >= 256 ||
 	    len > sizeof ldst.u.i2c.data)
 		return -EINVAL;
 
 	memset(&ldst, 0, sizeof ldst);
 	ldst_addrspace = V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_I2C);
 	ldst.op_to_addrspace =
 		cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
 			    F_FW_CMD_REQUEST |
 			    F_FW_CMD_READ |
 			    ldst_addrspace);
 	ldst.cycles_to_len16 = cpu_to_be32(FW_LEN16(ldst));
 	ldst.u.i2c.pid = (port < 0 ? 0xff : port);
 	ldst.u.i2c.did = devid;
 	ldst.u.i2c.boffset = offset;
 	ldst.u.i2c.blen = len;
 	ret = t4_wr_mbox(adap, mbox, &ldst, sizeof ldst, &ldst);
 	if (!ret)
 		memcpy(buf, ldst.u.i2c.data, len);
 	return ret;
 }
 
 /**
  *	t4_i2c_wr - write I2C data to adapter
  *	@adap: the adapter
  *	@port: Port number if per-port device; <0 if not
  *	@devid: per-port device ID or absolute device ID
  *	@offset: byte offset into device I2C space
  *	@len: byte length of I2C space data
  *	@buf: buffer containing new I2C data
  *
  *	Write the I2C data to the indicated device and location.
  */
 int t4_i2c_wr(struct adapter *adap, unsigned int mbox,
 	      int port, unsigned int devid,
 	      unsigned int offset, unsigned int len,
 	      u8 *buf)
 {
 	u32 ldst_addrspace;
 	struct fw_ldst_cmd ldst;
 
 	if (port >= 4 ||
 	    devid >= 256 ||
 	    offset >= 256 ||
 	    len > sizeof ldst.u.i2c.data)
 		return -EINVAL;
 
 	memset(&ldst, 0, sizeof ldst);
 	ldst_addrspace = V_FW_LDST_CMD_ADDRSPACE(FW_LDST_ADDRSPC_I2C);
 	ldst.op_to_addrspace =
 		cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
 			    F_FW_CMD_REQUEST |
 			    F_FW_CMD_WRITE |
 			    ldst_addrspace);
 	ldst.cycles_to_len16 = cpu_to_be32(FW_LEN16(ldst));
 	ldst.u.i2c.pid = (port < 0 ? 0xff : port);
 	ldst.u.i2c.did = devid;
 	ldst.u.i2c.boffset = offset;
 	ldst.u.i2c.blen = len;
 	memcpy(ldst.u.i2c.data, buf, len);
 	return t4_wr_mbox(adap, mbox, &ldst, sizeof ldst, &ldst);
 }
 
 /**
  * 	t4_sge_ctxt_rd - read an SGE context through FW
  * 	@adap: the adapter
  * 	@mbox: mailbox to use for the FW command
  * 	@cid: the context id
  * 	@ctype: the context type
  * 	@data: where to store the context data
  *
  * 	Issues a FW command through the given mailbox to read an SGE context.
  */
 int t4_sge_ctxt_rd(struct adapter *adap, unsigned int mbox, unsigned int cid,
 		   enum ctxt_type ctype, u32 *data)
 {
 	int ret;
 	struct fw_ldst_cmd c;
 
 	if (ctype == CTXT_EGRESS)
 		ret = FW_LDST_ADDRSPC_SGE_EGRC;
 	else if (ctype == CTXT_INGRESS)
 		ret = FW_LDST_ADDRSPC_SGE_INGC;
 	else if (ctype == CTXT_FLM)
 		ret = FW_LDST_ADDRSPC_SGE_FLMC;
 	else
 		ret = FW_LDST_ADDRSPC_SGE_CONMC;
 
 	memset(&c, 0, sizeof(c));
 	c.op_to_addrspace = cpu_to_be32(V_FW_CMD_OP(FW_LDST_CMD) |
 					F_FW_CMD_REQUEST | F_FW_CMD_READ |
 					V_FW_LDST_CMD_ADDRSPACE(ret));
 	c.cycles_to_len16 = cpu_to_be32(FW_LEN16(c));
 	c.u.idctxt.physid = cpu_to_be32(cid);
 
 	ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
 	if (ret == 0) {
 		data[0] = be32_to_cpu(c.u.idctxt.ctxt_data0);
 		data[1] = be32_to_cpu(c.u.idctxt.ctxt_data1);
 		data[2] = be32_to_cpu(c.u.idctxt.ctxt_data2);
 		data[3] = be32_to_cpu(c.u.idctxt.ctxt_data3);
 		data[4] = be32_to_cpu(c.u.idctxt.ctxt_data4);
 		data[5] = be32_to_cpu(c.u.idctxt.ctxt_data5);
 	}
 	return ret;
 }
 
 /**
  * 	t4_sge_ctxt_rd_bd - read an SGE context bypassing FW
  * 	@adap: the adapter
  * 	@cid: the context id
  * 	@ctype: the context type
  * 	@data: where to store the context data
  *
  * 	Reads an SGE context directly, bypassing FW.  This is only for
  * 	debugging when FW is unavailable.
  */
 int t4_sge_ctxt_rd_bd(struct adapter *adap, unsigned int cid, enum ctxt_type ctype,
 		      u32 *data)
 {
 	int i, ret;
 
 	t4_write_reg(adap, A_SGE_CTXT_CMD, V_CTXTQID(cid) | V_CTXTTYPE(ctype));
 	ret = t4_wait_op_done(adap, A_SGE_CTXT_CMD, F_BUSY, 0, 3, 1);
 	if (!ret)
 		for (i = A_SGE_CTXT_DATA0; i <= A_SGE_CTXT_DATA5; i += 4)
 			*data++ = t4_read_reg(adap, i);
 	return ret;
 }
 
 int t4_sched_config(struct adapter *adapter, int type, int minmaxen,
     int sleep_ok)
 {
 	struct fw_sched_cmd cmd;
 
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_SCHED_CMD) |
 				      F_FW_CMD_REQUEST |
 				      F_FW_CMD_WRITE);
 	cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
 
 	cmd.u.config.sc = FW_SCHED_SC_CONFIG;
 	cmd.u.config.type = type;
 	cmd.u.config.minmaxen = minmaxen;
 
 	return t4_wr_mbox_meat(adapter,adapter->mbox, &cmd, sizeof(cmd),
 			       NULL, sleep_ok);
 }
 
 int t4_sched_params(struct adapter *adapter, int type, int level, int mode,
 		    int rateunit, int ratemode, int channel, int cl,
 		    int minrate, int maxrate, int weight, int pktsize,
 		    int burstsize, int sleep_ok)
 {
 	struct fw_sched_cmd cmd;
 
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_SCHED_CMD) |
 				      F_FW_CMD_REQUEST |
 				      F_FW_CMD_WRITE);
 	cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
 
 	cmd.u.params.sc = FW_SCHED_SC_PARAMS;
 	cmd.u.params.type = type;
 	cmd.u.params.level = level;
 	cmd.u.params.mode = mode;
 	cmd.u.params.ch = channel;
 	cmd.u.params.cl = cl;
 	cmd.u.params.unit = rateunit;
 	cmd.u.params.rate = ratemode;
 	cmd.u.params.min = cpu_to_be32(minrate);
 	cmd.u.params.max = cpu_to_be32(maxrate);
 	cmd.u.params.weight = cpu_to_be16(weight);
 	cmd.u.params.pktsize = cpu_to_be16(pktsize);
 	cmd.u.params.burstsize = cpu_to_be16(burstsize);
 
 	return t4_wr_mbox_meat(adapter,adapter->mbox, &cmd, sizeof(cmd),
 			       NULL, sleep_ok);
 }
 
 int t4_sched_params_ch_rl(struct adapter *adapter, int channel, int ratemode,
     unsigned int maxrate, int sleep_ok)
 {
 	struct fw_sched_cmd cmd;
 
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_SCHED_CMD) |
 				      F_FW_CMD_REQUEST |
 				      F_FW_CMD_WRITE);
 	cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
 
 	cmd.u.params.sc = FW_SCHED_SC_PARAMS;
 	cmd.u.params.type = FW_SCHED_TYPE_PKTSCHED;
 	cmd.u.params.level = FW_SCHED_PARAMS_LEVEL_CH_RL;
 	cmd.u.params.ch = channel;
 	cmd.u.params.rate = ratemode;		/* REL or ABS */
 	cmd.u.params.max = cpu_to_be32(maxrate);/*  %  or kbps */
 
 	return t4_wr_mbox_meat(adapter,adapter->mbox, &cmd, sizeof(cmd),
 			       NULL, sleep_ok);
 }
 
 int t4_sched_params_cl_wrr(struct adapter *adapter, int channel, int cl,
     int weight, int sleep_ok)
 {
 	struct fw_sched_cmd cmd;
 
 	if (weight < 0 || weight > 100)
 		return -EINVAL;
 
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_SCHED_CMD) |
 				      F_FW_CMD_REQUEST |
 				      F_FW_CMD_WRITE);
 	cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
 
 	cmd.u.params.sc = FW_SCHED_SC_PARAMS;
 	cmd.u.params.type = FW_SCHED_TYPE_PKTSCHED;
 	cmd.u.params.level = FW_SCHED_PARAMS_LEVEL_CL_WRR;
 	cmd.u.params.ch = channel;
 	cmd.u.params.cl = cl;
 	cmd.u.params.weight = cpu_to_be16(weight);
 
 	return t4_wr_mbox_meat(adapter,adapter->mbox, &cmd, sizeof(cmd),
 			       NULL, sleep_ok);
 }
 
 int t4_sched_params_cl_rl_kbps(struct adapter *adapter, int channel, int cl,
     int mode, unsigned int maxrate, int pktsize, int sleep_ok)
 {
 	struct fw_sched_cmd cmd;
 
 	memset(&cmd, 0, sizeof(cmd));
 	cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_SCHED_CMD) |
 				      F_FW_CMD_REQUEST |
 				      F_FW_CMD_WRITE);
 	cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
 
 	cmd.u.params.sc = FW_SCHED_SC_PARAMS;
 	cmd.u.params.type = FW_SCHED_TYPE_PKTSCHED;
 	cmd.u.params.level = FW_SCHED_PARAMS_LEVEL_CL_RL;
 	cmd.u.params.mode = mode;
 	cmd.u.params.ch = channel;
 	cmd.u.params.cl = cl;
 	cmd.u.params.unit = FW_SCHED_PARAMS_UNIT_BITRATE;
 	cmd.u.params.rate = FW_SCHED_PARAMS_RATE_ABS;
 	cmd.u.params.max = cpu_to_be32(maxrate);
 	cmd.u.params.pktsize = cpu_to_be16(pktsize);
 
 	return t4_wr_mbox_meat(adapter,adapter->mbox, &cmd, sizeof(cmd),
 			       NULL, sleep_ok);
 }
 
 /*
  *	t4_config_watchdog - configure (enable/disable) a watchdog timer
  *	@adapter: the adapter
  * 	@mbox: mailbox to use for the FW command
  * 	@pf: the PF owning the queue
  * 	@vf: the VF owning the queue
  *	@timeout: watchdog timeout in ms
  *	@action: watchdog timer / action
  *
  *	There are separate watchdog timers for each possible watchdog
  *	action.  Configure one of the watchdog timers by setting a non-zero
  *	timeout.  Disable a watchdog timer by using a timeout of zero.
  */
 int t4_config_watchdog(struct adapter *adapter, unsigned int mbox,
 		       unsigned int pf, unsigned int vf,
 		       unsigned int timeout, unsigned int action)
 {
 	struct fw_watchdog_cmd wdog;
 	unsigned int ticks;
 
 	/*
 	 * The watchdog command expects a timeout in units of 10ms so we need
 	 * to convert it here (via rounding) and force a minimum of one 10ms
 	 * "tick" if the timeout is non-zero but the conversion results in 0
 	 * ticks.
 	 */
 	ticks = (timeout + 5)/10;
 	if (timeout && !ticks)
 		ticks = 1;
 
 	memset(&wdog, 0, sizeof wdog);
 	wdog.op_to_vfn = cpu_to_be32(V_FW_CMD_OP(FW_WATCHDOG_CMD) |
 				     F_FW_CMD_REQUEST |
 				     F_FW_CMD_WRITE |
 				     V_FW_PARAMS_CMD_PFN(pf) |
 				     V_FW_PARAMS_CMD_VFN(vf));
 	wdog.retval_len16 = cpu_to_be32(FW_LEN16(wdog));
 	wdog.timeout = cpu_to_be32(ticks);
 	wdog.action = cpu_to_be32(action);
 
 	return t4_wr_mbox(adapter, mbox, &wdog, sizeof wdog, NULL);
 }
 
 int t4_get_devlog_level(struct adapter *adapter, unsigned int *level)
 {
 	struct fw_devlog_cmd devlog_cmd;
 	int ret;
 
 	memset(&devlog_cmd, 0, sizeof(devlog_cmd));
 	devlog_cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_DEVLOG_CMD) |
 					     F_FW_CMD_REQUEST | F_FW_CMD_READ);
 	devlog_cmd.retval_len16 = cpu_to_be32(FW_LEN16(devlog_cmd));
 	ret = t4_wr_mbox(adapter, adapter->mbox, &devlog_cmd,
 			 sizeof(devlog_cmd), &devlog_cmd);
 	if (ret)
 		return ret;
 
 	*level = devlog_cmd.level;
 	return 0;
 }
 
 int t4_set_devlog_level(struct adapter *adapter, unsigned int level)
 {
 	struct fw_devlog_cmd devlog_cmd;
 
 	memset(&devlog_cmd, 0, sizeof(devlog_cmd));
 	devlog_cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_DEVLOG_CMD) |
 					     F_FW_CMD_REQUEST |
 					     F_FW_CMD_WRITE);
 	devlog_cmd.level = level;
 	devlog_cmd.retval_len16 = cpu_to_be32(FW_LEN16(devlog_cmd));
 	return t4_wr_mbox(adapter, adapter->mbox, &devlog_cmd,
 			  sizeof(devlog_cmd), &devlog_cmd);
 }
Index: projects/clang800-import/sys/dev/cxgbe/firmware/t4fw_cfg.txt
===================================================================
--- projects/clang800-import/sys/dev/cxgbe/firmware/t4fw_cfg.txt	(revision 344548)
+++ projects/clang800-import/sys/dev/cxgbe/firmware/t4fw_cfg.txt	(revision 344549)
@@ -1,252 +1,248 @@
 # Firmware configuration file.
 #
 # Global limits (some are hardware limits, others are due to the firmware).
 # nvi = 128		virtual interfaces
 # niqflint = 1023	ingress queues with freelists and/or interrupts
 # nethctrl = 64K	Ethernet or ctrl egress queues
 # neq = 64K		egress queues of all kinds, including freelists
 # nexactf = 336		MPS TCAM entries, can oversubscribe.
 #
 
 [global]
 	rss_glb_config_mode = basicvirtual
 	rss_glb_config_options = tnlmapen,hashtoeplitz,tnlalllkp
 
 	sge_timer_value = 1, 5, 10, 50, 100, 200	# usecs
 
 	# enable TP_OUT_CONFIG.IPIDSPLITMODE
 	reg[0x7d04] = 0x00010000/0x00010000
 
 	# disable TP_PARA_REG3.RxFragEn
 	reg[0x7d6c] = 0x00000000/0x00007000
 
 	reg[0x7dc0] = 0x0e2f8849		# TP_SHIFT_CNT
 
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = protocol, fcoe
 
 	tp_pmrx = 36, 512
 	tp_pmrx_pagesize = 64K
 
 	# TP number of RX channels (0 = auto)
 	tp_nrxch = 0
 
 	tp_pmtx = 46, 512
 	tp_pmtx_pagesize = 64K
 
 	# TP number of TX channels (0 = auto)
 	tp_ntxch = 0
 
 	# TP OFLD MTUs
 	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
 
 	# cluster, lan, or wan.
 	tp_tcptuning = lan
 
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
 # PF4 is the resource-rich PF that the bus/nexus driver attaches to.
 # It gets 32 MSI/128 MSI-X vectors.
 [function "4"]
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 16
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
 	nexactf = 280
 	cmask = all
 	pmask = all
 	nethofld = 2048
 
 	# driver will mask off features it won't use
 	protocol = ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu
 
 	tp_l2t = 4096
 	tp_ddp = 2
 	tp_ddp_iscsi = 2
 	tp_stag = 2
 	tp_pbl = 5
 	tp_rq = 7
 
 	# TCAM has 8K cells; each region must start at a multiple of 128 cell.
 	# Each entry in these categories takes 4 cells each.  nhash will use the
 	# TCAM iff there is room left (that is, the rest don't add up to 2048).
 	nroute = 32
 	nclip = 32
 	nfilter = 1456
 	nserver = 512
 	nhash = 16384
 
 # PF5 is the SCSI Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "5"]
 	nvi = 1
 	rssnvi = 0
 
 # PF6 is the FCoE Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "6"]
 	nvi = 1
 	rssnvi = 0
 
 # The following function, 1023, is not an actual PCIE function but is used to
 # configure and reserve firmware internal resources that come from the global
 # resource pool.
 [function "1023"]
 	wx_caps = all
 	r_caps = all
 	nvi = 4
 	rssnvi = 0
 	cmask = all
 	pmask = all
 	nexactf = 8
 	nfilter = 16
 
 # For Virtual functions, we only allow NIC functionality and we only allow
 # access to one port (1 << PF).  Note that because of limitations in the
 # Scatter Gather Engine (SGE) hardware which checks writes to VF KDOORBELL
 # and GTS registers, the number of Ingress and Egress Queues must be a power
 # of 2.
 #
 [function "0/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
 # MPS has 192K buffer space for ingress packets from the wire as well as
 # loopback path of the L2 switch.
 [port "0"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "1"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "2"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "3"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [fini]
 	version = 0x1
-	checksum = 0x159b9295
+	checksum = 0x3ecbe8a0
 #
 # $FreeBSD$
 #
Index: projects/clang800-import/sys/dev/cxgbe/firmware/t5fw_cfg.txt
===================================================================
--- projects/clang800-import/sys/dev/cxgbe/firmware/t5fw_cfg.txt	(revision 344548)
+++ projects/clang800-import/sys/dev/cxgbe/firmware/t5fw_cfg.txt	(revision 344549)
@@ -1,297 +1,293 @@
 # Firmware configuration file.
 #
 # Global limits (some are hardware limits, others are due to the firmware).
 # nvi = 128		virtual interfaces
 # niqflint = 1023	ingress queues with freelists and/or interrupts
 # nethctrl = 64K	Ethernet or ctrl egress queues
 # neq = 64K		egress queues of all kinds, including freelists
 # nexactf = 512		MPS TCAM entries, can oversubscribe.
 #
 
 [global]
 	rss_glb_config_mode = basicvirtual
 	rss_glb_config_options = tnlmapen,hashtoeplitz,tnlalllkp
 
 	# PL_TIMEOUT register
 	pl_timeout_value = 10000	# the timeout value in units of us
 
 	# SGE_THROTTLE_CONTROL
 	bar2throttlecount = 500		# bar2throttlecount in us
 
 	sge_timer_value = 1, 5, 10, 50, 100, 200	# SGE_TIMER_VALUE* in usecs
 
 	reg[0x1124] = 0x00000400/0x00000400 # SGE_CONTROL2, enable VFIFO; if
 					# SGE_VFIFO_SIZE is not set, then
 					# firmware will set it up in function
 					# of number of egress queues used
 
 	reg[0x1130] = 0x00d5ffeb	# SGE_DBP_FETCH_THRESHOLD, fetch
 					# threshold set to queue depth
 					# minus 128-entries for FL and HP
 					# queues, and 0xfff for LP which
 					# prompts the firmware to set it up
 					# in function of egress queues
 					# used
 
 	reg[0x113c] = 0x0002ffc0	# SGE_VFIFO_SIZE, set to 0x2ffc0 which
 					# prompts the firmware to set it up in
 					# function of number of egress queues
 					# used 
 
 	# enable TP_OUT_CONFIG.IPIDSPLITMODE
 	reg[0x7d04] = 0x00010000/0x00010000
 
 	# disable TP_PARA_REG3.RxFragEn
 	reg[0x7d6c] = 0x00000000/0x00007000
 
 	# enable TP_PARA_REG6.EnableCSnd
 	reg[0x7d78] = 0x00000400/0x00000000
 
 	reg[0x7dc0] = 0x0e2f8849	# TP_SHIFT_CNT
 
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = protocol, fcoe
 
 	tp_pmrx = 36, 512
 	tp_pmrx_pagesize = 64K
 
 	# TP number of RX channels (0 = auto)
 	tp_nrxch = 0
 
 	tp_pmtx = 46, 512
 	tp_pmtx_pagesize = 64K
 
 	# TP number of TX channels (0 = auto)
 	tp_ntxch = 0
 
 	# TP OFLD MTUs
 	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
 
 	# TP_GLOBAL_CONFIG
 	reg[0x7d08] = 0x00000800/0x00000800 # set IssFromCplEnable
 
 	# TP_PC_CONFIG
 	reg[0x7d48] = 0x00000000/0x00000400 # clear EnableFLMError
 
 	# TP_PARA_REG0
 	reg[0x7d60] = 0x06000000/0x07000000 # set InitCWND to 6
 
 	# cluster, lan, or wan.
 	tp_tcptuning = lan
 
 	# MC configuration
 	mc_mode_brc[0] = 1		# mc0 - 1: enable BRC, 0: enable RBC
 	mc_mode_brc[1] = 1		# mc1 - 1: enable BRC, 0: enable RBC
 
 	# ULP_TX_CONFIG
 	reg[0x8dc0] = 0x00000004/0x00000004 # Enable more error msg for ...
 					    # TPT error.
 
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
 # PF4 is the resource-rich PF that the bus/nexus driver attaches to.
 # It gets 32 MSI/128 MSI-X vectors.
 [function "4"]
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 16
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
 	nqpcq = 8192
 	nexactf = 456
 	cmask = all
 	pmask = all
 	nethofld = 8192
 
 	# driver will mask off features it won't use
 	protocol = ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif
 
 	tp_l2t = 4096
 	tp_ddp = 2
 	tp_ddp_iscsi = 2
 	tp_stag = 2
 	tp_pbl = 5
 	tp_rq = 7
 
 	# TCAM has 8K cells; each region must start at a multiple of 128 cell.
 	# Each entry in these categories takes 4 cells each.  nhash will use the
 	# TCAM iff there is room left (that is, the rest don't add up to 2048).
 	nroute = 32
 	nclip = 32
 	nfilter = 1008
 	nserver = 512
 	nhash = 16384
 
 # PF5 is the SCSI Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "5"]
 	nvi = 1
 	rssnvi = 0
 
 # PF6 is the FCoE Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "6"]
 	nvi = 1
 	rssnvi = 0
 
 # The following function, 1023, is not an actual PCIE function but is used to
 # configure and reserve firmware internal resources that come from the global
 # resource pool.
 [function "1023"]
 	wx_caps = all
 	r_caps = all
 	nvi = 4
 	rssnvi = 0
 	cmask = all
 	pmask = all
 	nexactf = 8
 	nfilter = 16
 
 # For Virtual functions, we only allow NIC functionality and we only allow
 # access to one port (1 << PF).  Note that because of limitations in the
 # Scatter Gather Engine (SGE) hardware which checks writes to VF KDOORBELL
 # and GTS registers, the number of Ingress and Egress Queues must be a power
 # of 2.
 #
 [function "0/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
 # MPS has 192K buffer space for ingress packets from the wire as well as
 # loopback path of the L2 switch.
 [port "0"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "1"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "2"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "3"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [fini]
 	version = 0x1
-	checksum = 0x30b6a157
+	checksum = 0x34da8705
 #
 # $FreeBSD$
 #
Index: projects/clang800-import/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt
===================================================================
--- projects/clang800-import/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt	(revision 344548)
+++ projects/clang800-import/sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt	(revision 344549)
@@ -1,300 +1,296 @@
 # Firmware configuration file.
 #
 # Global limits (some are hardware limits, others are due to the firmware).
 # nvi = 128		virtual interfaces
 # niqflint = 1023	ingress queues with freelists and/or interrupts
 # nethctrl = 64K	Ethernet or ctrl egress queues
 # neq = 64K		egress queues of all kinds, including freelists
 # nexactf = 512		MPS TCAM entries, can oversubscribe.
 #
 
 [global]
 	rss_glb_config_mode = basicvirtual
 	rss_glb_config_options = tnlmapen,hashtoeplitz,tnlalllkp
 
 	# PL_TIMEOUT register
 	pl_timeout_value = 10000	# the timeout value in units of us
 
 	# SGE_THROTTLE_CONTROL
 	bar2throttlecount = 500		# bar2throttlecount in us
 
 	sge_timer_value = 1, 5, 10, 50, 100, 200	# SGE_TIMER_VALUE* in usecs
 
 	reg[0x1124] = 0x00000400/0x00000400 # SGE_CONTROL2, enable VFIFO; if
 					# SGE_VFIFO_SIZE is not set, then
 					# firmware will set it up in function
 					# of number of egress queues used
 
 	reg[0x1130] = 0x00d5ffeb	# SGE_DBP_FETCH_THRESHOLD, fetch
 					# threshold set to queue depth
 					# minus 128-entries for FL and HP
 					# queues, and 0xfff for LP which
 					# prompts the firmware to set it up
 					# in function of egress queues
 					# used
 
 	reg[0x113c] = 0x0002ffc0	# SGE_VFIFO_SIZE, set to 0x2ffc0 which
 					# prompts the firmware to set it up in
 					# function of number of egress queues
 					# used 
 
 	# enable TP_OUT_CONFIG.IPIDSPLITMODE
 	reg[0x7d04] = 0x00010000/0x00010000
 
 	# disable TP_PARA_REG3.RxFragEn
 	reg[0x7d6c] = 0x00000000/0x00007000
 
 	# enable TP_PARA_REG6.EnableCSnd
 	reg[0x7d78] = 0x00000400/0x00000000
 
 	reg[0x7dc0] = 0x0e2f8849	# TP_SHIFT_CNT
 
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = port, protocol
 
 	tp_pmrx = 20, 512
 	tp_pmrx_pagesize = 16K
 
 	# TP number of RX channels (0 = auto)
 	tp_nrxch = 0
 
 	tp_pmtx = 40, 512
 	tp_pmtx_pagesize = 64K
 
 	# TP number of TX channels (0 = auto)
 	tp_ntxch = 0
 
 	# TP OFLD MTUs
 	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
 
 	# TP_GLOBAL_CONFIG
 	reg[0x7d08] = 0x00000800/0x00000800 # set IssFromCplEnable
 
 	# TP_PC_CONFIG
 	reg[0x7d48] = 0x00000000/0x00000400 # clear EnableFLMError
 
 	# TP_PC_CONFIG2
 	reg[0x7d4c] = 0x00010000/0x00010000 # set DisableNewPshFlag
 
 	# TP_PARA_REG0
 	reg[0x7d60] = 0x06000000/0x07000000 # set InitCWND to 6
 
 	# TP_PARA_REG3
 	reg[0x7d6c] = 0x28000000/0x28000000 # set EnableTnlCngHdr
 					    # set RxMacCheck (Note:
 					    # Only for hash filter,
 					    # no tcp offload)
 
 	# TP_PIO_ADDR:TP_RX_LPBK
 	reg[tp_pio:0x28] = 0x00208208/0x00ffffff # set commit limits to 8
 
 	# MC configuration
 	mc_mode_brc[0] = 0		# mc0 - 1: enable BRC, 0: enable RBC
 	mc_mode_brc[1] = 0		# mc1 - 1: enable BRC, 0: enable RBC
 
 	# ULP_TX_CONFIG
 	reg[0x8dc0] = 0x00000004/0x00000004 # Enable more error msg for ...
 					    # TPT error.
 
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
 # PF4 is the resource-rich PF that the bus/nexus driver attaches to.
 # It gets 32 MSI/128 MSI-X vectors.
 [function "4"]
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 16
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
 	nqpcq = 8192
 	nexactf = 456
 	cmask = all
 	pmask = all
 
 	# driver will mask off features it won't use
 	protocol = nic_hashfilter
 
 	tp_l2t = 4096
 
 	# TCAM has 8K cells; each region must start at a multiple of 128 cell.
 	# Each entry in these categories takes 4 cells each.  nhash will use the
 	# TCAM iff there is room left (that is, the rest don't add up to 2048).
 	nroute = 32
 	nclip = 32
 	nfilter = 1008
 	nserver = 512
 	nhash = 524288
 
 # PF5 is the SCSI Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "5"]
 	nvi = 1
 	rssnvi = 0
 
 # PF6 is the FCoE Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "6"]
 	nvi = 1
 	rssnvi = 0
 
 # The following function, 1023, is not an actual PCIE function but is used to
 # configure and reserve firmware internal resources that come from the global
 # resource pool.
 [function "1023"]
 	wx_caps = all
 	r_caps = all
 	nvi = 4
 	rssnvi = 0
 	cmask = all
 	pmask = all
 	nexactf = 8
 	nfilter = 16
 
 # For Virtual functions, we only allow NIC functionality and we only allow
 # access to one port (1 << PF).  Note that because of limitations in the
 # Scatter Gather Engine (SGE) hardware which checks writes to VF KDOORBELL
 # and GTS registers, the number of Ingress and Egress Queues must be a power
 # of 2.
 #
 [function "0/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
 # MPS has 192K buffer space for ingress packets from the wire as well as
 # loopback path of the L2 switch.
 [port "0"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "1"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "2"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [port "3"]
 	dcb = none
 	bg_mem = 25
 	lpbk_mem = 25
 	hwm = 30
 	lwm = 15
 	dwm = 30
 
 [fini]
 	version = 0x1
-	checksum = 0x380a0a4
+	checksum = 0x7a962d44
 #
 # $FreeBSD$
 #
Index: projects/clang800-import/sys/dev/cxgbe/firmware/t6fw_cfg.txt
===================================================================
--- projects/clang800-import/sys/dev/cxgbe/firmware/t6fw_cfg.txt	(revision 344548)
+++ projects/clang800-import/sys/dev/cxgbe/firmware/t6fw_cfg.txt	(revision 344549)
@@ -1,282 +1,278 @@
 # Firmware configuration file.
 #
 # Global limits (some are hardware limits, others are due to the firmware).
 # nvi = 128		virtual interfaces
 # niqflint = 1023	ingress queues with freelists and/or interrupts
 # nethctrl = 64K	Ethernet or ctrl egress queues
 # neq = 64K		egress queues of all kinds, including freelists
 # nexactf = 512		MPS TCAM entries, can oversubscribe.
 
 [global]
 	rss_glb_config_mode = basicvirtual
 	rss_glb_config_options = tnlmapen,hashtoeplitz,tnlalllkp
 
 	# PL_TIMEOUT register
 	pl_timeout_value = 200		# the timeout value in units of us
 
 	sge_timer_value = 1, 5, 10, 50, 100, 200	# SGE_TIMER_VALUE* in usecs
 
 	reg[0x10c4] = 0x20000000/0x20000000 # GK_CONTROL, enable 5th thread
 
 	reg[0x7dc0] = 0x0e2f8849	# TP_SHIFT_CNT
 
 	#Tick granularities in kbps
 	tsch_ticks = 100000, 10000, 1000, 10
 
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = protocol
 
 	tp_pmrx = 36, 512
 	tp_pmrx_pagesize = 64K
 
 	# TP number of RX channels (0 = auto)
 	tp_nrxch = 0
 
 	tp_pmtx = 46, 512
 	tp_pmtx_pagesize = 64K
 
 	# TP number of TX channels (0 = auto)
 	tp_ntxch = 0
 
 	# TP OFLD MTUs
 	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
 
 	# enable TP_OUT_CONFIG.IPIDSPLITMODE and CRXPKTENC
 	reg[0x7d04] = 0x00010008/0x00010008
 
 	# TP_GLOBAL_CONFIG
 	reg[0x7d08] = 0x00000800/0x00000800 # set IssFromCplEnable
 
 	# TP_PC_CONFIG
 	reg[0x7d48] = 0x00000000/0x00000400 # clear EnableFLMError
 
 	# TP_PARA_REG0
 	reg[0x7d60] = 0x06000000/0x07000000 # set InitCWND to 6
 
 	# cluster, lan, or wan.
 	tp_tcptuning = lan
 
 	# LE_DB_CONFIG
 	reg[0x19c04] = 0x00000000/0x00440000 # LE Server SRAM disabled
 					     # LE IPv4 compression disabled 
 	# LE_DB_HASH_CONFIG
 	reg[0x19c28] = 0x00800000/0x01f00000 # LE Hash bucket size 8, 
 
 	# ULP_TX_CONFIG
 	reg[0x8dc0] = 0x00000104/0x00000104 # Enable ITT on PI err
 					    # Enable more error msg for ...
 					    # TPT error.
 
 	# ULP_RX_MISC_FEATURE_ENABLE
 	#reg[0x1925c] = 0x01003400/0x01003400 # iscsi tag pi bit
 					     # Enable offset decrement after ...
 					     # PI extraction and before DDP
 					     # ulp insert pi source info in DIF
 					     # iscsi_eff_offset_en
 
 	#Enable iscsi completion moderation feature
 	reg[0x1925c] = 0x000041c0/0x000031c0	# Enable offset decrement after
 						# PI extraction and before DDP.
 						# ulp insert pi source info in
 						# DIF.
 						# Enable iscsi hdr cmd mode.
 						# iscsi force cmd mode.
 						# Enable iscsi cmp mode.
 	# MC configuration
 	#mc_mode_brc[0] = 1		# mc0 - 1: enable BRC, 0: enable RBC
 
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
 # PF4 is the resource-rich PF that the bus/nexus driver attaches to.
 # It gets 32 MSI/128 MSI-X vectors.
 [function "4"]
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 32
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
 	nqpcq = 8192
 	nexactf = 456
 	cmask = all
 	pmask = all
 	ncrypto_lookaside = 16
 	nclip = 320
 	nethofld = 8192
 
 	# TCAM has 6K cells; each region must start at a multiple of 128 cell.
 	# Each entry in these categories takes 2 cells each.  nhash will use the
 	# TCAM iff there is room left (that is, the rest don't add up to 3072).
 	nfilter = 2032
 	nserver = 512
 	nhpfilter = 0
 	nhash = 16384
 	protocol = ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu, iscsi_t10dif, tlskeys, crypto_lookaside
 	tp_l2t = 4096
 	tp_ddp = 2
 	tp_ddp_iscsi = 2
 	tp_tls_key = 3
 	tp_tls_mxrxsize = 17408    # 16384 + 1024, governs max rx data, pm max xfer len, rx coalesce sizes
 	tp_stag = 2
 	tp_pbl = 5
 	tp_rq = 7
 	tp_srq = 128
 
 # PF5 is the SCSI Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "5"]
 	nvi = 1
 	rssnvi = 0
 
 # PF6 is the FCoE Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "6"]
 	nvi = 1
 	rssnvi = 0
 
 # The following function, 1023, is not an actual PCIE function but is used to
 # configure and reserve firmware internal resources that come from the global
 # resource pool.
 #
 [function "1023"]
 	wx_caps = all
 	r_caps = all
 	nvi = 4
 	rssnvi = 0
 	cmask = all
 	pmask = all
 	nexactf = 8
 	nfilter = 16
 
 
 # For Virtual functions, we only allow NIC functionality and we only allow
 # access to one port (1 << PF).  Note that because of limitations in the
 # Scatter Gather Engine (SGE) hardware which checks writes to VF KDOORBELL
 # and GTS registers, the number of Ingress and Egress Queues must be a power
 # of 2.
 #
 [function "0/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "3/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 # MPS has 192K buffer space for ingress packets from the wire as well as
 # loopback path of the L2 switch.
 [port "0"]
 	dcb = none
 	#bg_mem = 25
 	#lpbk_mem = 25
 	hwm = 60
 	lwm = 15
 	dwm = 30
 
 [port "1"]
 	dcb = none
 	#bg_mem = 25
 	#lpbk_mem = 25
 	hwm = 60
 	lwm = 15
 	dwm = 30
 
 [fini]
 	version = 0x1
-	checksum = 0xf3e93001
+	checksum = 0x4528a6ac
 #
 # $FreeBSD$
 #
Index: projects/clang800-import/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt
===================================================================
--- projects/clang800-import/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt	(revision 344548)
+++ projects/clang800-import/sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt	(revision 344549)
@@ -1,265 +1,261 @@
 # Firmware configuration file.
 #
 # Global limits (some are hardware limits, others are due to the firmware).
 # nvi = 128		virtual interfaces
 # niqflint = 1023	ingress queues with freelists and/or interrupts
 # nethctrl = 64K	Ethernet or ctrl egress queues
 # neq = 64K		egress queues of all kinds, including freelists
 # nexactf = 512		MPS TCAM entries, can oversubscribe.
 
 [global]
 	rss_glb_config_mode = basicvirtual
 	rss_glb_config_options = tnlmapen,hashtoeplitz,tnlalllkp
 
 	# PL_TIMEOUT register
 	pl_timeout_value = 200		# the timeout value in units of us
 
 	sge_timer_value = 1, 5, 10, 50, 100, 200	# SGE_TIMER_VALUE* in usecs
 
 	reg[0x10c4] = 0x20000000/0x20000000 # GK_CONTROL, enable 5th thread
 
 	reg[0x7dc0] = 0x0e2f8849	# TP_SHIFT_CNT
 
 	#Tick granularities in kbps
 	tsch_ticks = 100000, 10000, 1000, 10
 
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = port, protocol
 
 	tp_pmrx = 20, 512
 	tp_pmrx_pagesize = 16K
 
 	# TP number of RX channels (0 = auto)
 	tp_nrxch = 0
 
 	tp_pmtx = 40, 512
 	tp_pmtx_pagesize = 64K
 
 	# TP number of TX channels (0 = auto)
 	tp_ntxch = 0
 
 	# TP OFLD MTUs
 	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
 
 	# enable TP_OUT_CONFIG.IPIDSPLITMODE and CRXPKTENC
 	reg[0x7d04] = 0x00010008/0x00010008
 
 	# TP_GLOBAL_CONFIG
 	reg[0x7d08] = 0x00000800/0x00000800 # set IssFromCplEnable
 
 	# TP_PC_CONFIG
 	reg[0x7d48] = 0x00000000/0x00000400 # clear EnableFLMError
 
 	# TP_PC_CONFIG2
 	reg[0x7d4c] = 0x00010000/0x00010000 # set DisableNewPshFlag
 
 	# TP_PARA_REG0
 	reg[0x7d60] = 0x06000000/0x07000000 # set InitCWND to 6
 
 	# TP_PARA_REG3
 	reg[0x7d6c] = 0x28000000/0x28000000 # set EnableTnlCngHdr
 					    # set RxMacCheck (Note:
 					    # Only for hash filter,
 					    # no tcp offload)
 
 	# LE_DB_CONFIG
 	reg[0x19c04] = 0x00000000/0x02040000 # LE IPv4 compression disabled
 					     # EXTN_HASH_IPV4 Disable
 
 	# LE_DB_RSP_CODE_0
 	reg[0x19c74] = 0x00000004/0x0000000f # TCAM_ACTV_HIT = 4
 
 	# LE_DB_RSP_CODE_1
 	reg[0x19c78] = 0x08000000/0x0e000000 # HASH_ACTV_HIT = 4
 
 	# LE_DB_HASH_CONFIG
 	reg[0x19c28] = 0x00800000/0x01f00000 # LE Hash bucket size 8, 
 
 	# MC configuration
 	mc_mode_brc[0] = 0		# mc0 - 1: enable BRC, 0: enable RBC
 
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.
 [function "0"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x4
 
 [function "3"]
-	nvf = 4
 	wx_caps = all
 	r_caps = all
-	nvi = 2
-	rssnvi = 2
-	niqflint = 4
-	nethctrl = 4
-	neq = 8
-	nexactf = 4
+	nvi = 1
+	rssnvi = 0
+	niqflint = 2
+	nethctrl = 2
+	neq = 4
+	nexactf = 2
 	cmask = all
 	pmask = 0x8
 
 # PF4 is the resource-rich PF that the bus/nexus driver attaches to.
 # It gets 32 MSI/128 MSI-X vectors.
 [function "4"]
 	wx_caps = all
 	r_caps = all
 	nvi = 32
-	rssnvi = 8
+	rssnvi = 32
 	niqflint = 512
 	nethctrl = 1024
 	neq = 2048
 	nqpcq = 8192
 	nexactf = 456
 	cmask = all
 	pmask = all
 	nclip = 320
 
 	# TCAM has 6K cells; each region must start at a multiple of 128 cell.
 	# Each entry in these categories takes 2 cells each.  nhash will use the
 	# TCAM iff there is room left (that is, the rest don't add up to 3072).
 	nfilter = 2032
 	nserver = 512
 	nhpfilter = 0
 	nhash = 524288
 	protocol = nic_hashfilter
 	tp_l2t = 4096
 
 # PF5 is the SCSI Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "5"]
 	nvi = 1
 	rssnvi = 0
 
 # PF6 is the FCoE Controller PF. It gets 32 MSI/40 MSI-X vectors.
 # Not used right now.
 [function "6"]
 	nvi = 1
 	rssnvi = 0
 
 # The following function, 1023, is not an actual PCIE function but is used to
 # configure and reserve firmware internal resources that come from the global
 # resource pool.
 #
 [function "1023"]
 	wx_caps = all
 	r_caps = all
 	nvi = 4
 	rssnvi = 0
 	cmask = all
 	pmask = all
 	nexactf = 8
 	nfilter = 16
 
 
 # For Virtual functions, we only allow NIC functionality and we only allow
 # access to one port (1 << PF).  Note that because of limitations in the
 # Scatter Gather Engine (SGE) hardware which checks writes to VF KDOORBELL
 # and GTS registers, the number of Ingress and Egress Queues must be a power
 # of 2.
 #
 [function "0/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "1/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 [function "2/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x1
 
 [function "3/*"]
 	wx_caps = 0x82
 	r_caps = 0x86
 	nvi = 1
-	rssnvi = 1
+	rssnvi = 0
 	niqflint = 2
 	nethctrl = 2
 	neq = 4
 	nexactf = 2
 	cmask = all
 	pmask = 0x2
 
 # MPS has 192K buffer space for ingress packets from the wire as well as
 # loopback path of the L2 switch.
 [port "0"]
 	dcb = none
 	#bg_mem = 25
 	#lpbk_mem = 25
 	hwm = 60
 	lwm = 15
 	dwm = 30
 
 [port "1"]
 	dcb = none
 	#bg_mem = 25
 	#lpbk_mem = 25
 	hwm = 60
 	lwm = 15
 	dwm = 30
 
 [fini]
 	version = 0x1
-	checksum = 0xb577311e
+	checksum = 0x5e0e0eb7
 #
 # $FreeBSD$
 #
Index: projects/clang800-import/sys/dev/flash/at45d.c
===================================================================
--- projects/clang800-import/sys/dev/flash/at45d.c	(revision 344548)
+++ projects/clang800-import/sys/dev/flash/at45d.c	(revision 344549)
@@ -1,512 +1,540 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2006 M. Warner Losh
  * Copyright (c) 2011-2012 Ian Lepore
  * Copyright (c) 2012 Marius Strobl <marius@FreeBSD.org>
  * 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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
+#include <sys/endian.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <geom/geom_disk.h>
 
 #include <dev/spibus/spi.h>
 #include "spibus_if.h"
 
 #include "opt_platform.h"
 
 #ifdef FDT
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/openfirm.h>
 
 static struct ofw_compat_data compat_data[] = {
 	{ "atmel,at45",		1 },
 	{ "atmel,dataflash",	1 },
 	{ NULL,			0 },
 };
 SPIBUS_PNP_INFO(compat_data);
 #endif
 
+/* This is the information returned by the MANUFACTURER_ID command. */
+struct at45d_mfg_info {
+	uint32_t	jedec_id; /* Mfg ID, DevId1, DevId2, ExtLen */
+	uint16_t	ext_id;   /* ExtId1, ExtId2 */
+};
+
+/*
+ * This is an entry in our table of metadata describing the chips.  We match on
+ * both jedec id and extended id info returned by the MANUFACTURER_ID command.
+ */
 struct at45d_flash_ident
 {
 	const char	*name;
 	uint32_t	jedec;
+	uint16_t	extid;
+	uint16_t	extmask;
 	uint16_t	pagecount;
 	uint16_t	pageoffset;
 	uint16_t	pagesize;
 	uint16_t	pagesize2n;
 };
 
 struct at45d_softc
 {
 	struct bio_queue_head	bio_queue;
 	struct mtx		sc_mtx;
 	struct disk		*disk;
 	struct proc		*p;
 	device_t		dev;
 	u_int			taskstate;
 	uint16_t		pagecount;
 	uint16_t		pageoffset;
 	uint16_t		pagesize;
 };
 
 #define	TSTATE_STOPPED	0
 #define	TSTATE_STOPPING	1
 #define	TSTATE_RUNNING	2
 
 #define	AT45D_LOCK(_sc)			mtx_lock(&(_sc)->sc_mtx)
 #define	AT45D_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
 #define	AT45D_LOCK_INIT(_sc) \
 	mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->dev), \
 	    "at45d", MTX_DEF)
 #define	AT45D_LOCK_DESTROY(_sc)		mtx_destroy(&_sc->sc_mtx);
 #define	AT45D_ASSERT_LOCKED(_sc)	mtx_assert(&_sc->sc_mtx, MA_OWNED);
 #define	AT45D_ASSERT_UNLOCKED(_sc)	mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);
 
 /* bus entry points */
 static device_attach_t at45d_attach;
 static device_detach_t at45d_detach;
 static device_probe_t at45d_probe;
 
 /* disk routines */
 static int at45d_close(struct disk *dp);
 static int at45d_open(struct disk *dp);
 static void at45d_strategy(struct bio *bp);
 static void at45d_task(void *arg);
 
 /* helper routines */
 static void at45d_delayed_attach(void *xsc);
-static int at45d_get_mfg_info(device_t dev, uint8_t *resp);
+static int at45d_get_mfg_info(device_t dev, struct at45d_mfg_info *resp);
 static int at45d_get_status(device_t dev, uint8_t *status);
 static int at45d_wait_ready(device_t dev, uint8_t *status);
 
 #define	BUFFER_TRANSFER			0x53
 #define	BUFFER_COMPARE			0x60
 #define	PROGRAM_THROUGH_BUFFER		0x82
 #define	MANUFACTURER_ID			0x9f
 #define	STATUS_REGISTER_READ		0xd7
 #define	CONTINUOUS_ARRAY_READ		0xe8
 
 /*
+ * Metadata for supported chips.
+ *
+ * The jedec id in this table includes the extended id length byte.  A match is
+ * based on both jedec id and extended id matching.  The chip's extended id (not
+ * present in most chips) is ANDed with ExtMask and the result is compared to
+ * ExtId.  If a chip only returns 1 ext id byte it will be in the upper 8 bits
+ * of ExtId in this table.
+ *
  * A sectorsize2n != 0 is used to indicate that a device optionally supports
  * 2^N byte pages.  If support for the latter is enabled, the sector offset
  * has to be reduced by one.
  */
 static const struct at45d_flash_ident at45d_flash_devices[] = {
-	{ "AT45DB011B", 0x1f2200, 512, 9, 264, 256 },
-	{ "AT45DB021B", 0x1f2300, 1024, 9, 264, 256 },
-	{ "AT45DB041x", 0x1f2400, 2028, 9, 264, 256 },
-	{ "AT45DB081B", 0x1f2500, 4096, 9, 264, 256 },
-	{ "AT45DB161x", 0x1f2600, 4096, 10, 528, 512 },
-	{ "AT45DB321x", 0x1f2700, 8192, 10, 528, 0 },
-	{ "AT45DB321x", 0x1f2701, 8192, 10, 528, 512 },
-	{ "AT45DB642x", 0x1f2800, 8192, 11, 1056, 1024 }
+	/* Part Name    Jedec ID    ExtId   ExtMask PgCnt Offs PgSz PgSz2n */
+	{ "AT45DB011B", 0x1f220000, 0x0000, 0x0000,   512,  9,  264,  256 },
+	{ "AT45DB021B", 0x1f230000, 0x0000, 0x0000,  1024,  9,  264,  256 },
+	{ "AT45DB041x", 0x1f240000, 0x0000, 0x0000,  2028,  9,  264,  256 },
+	{ "AT45DB081B", 0x1f250000, 0x0000, 0x0000,  4096,  9,  264,  256 },
+	{ "AT45DB161x", 0x1f260000, 0x0000, 0x0000,  4096, 10,  528,  512 },
+	{ "AT45DB321x", 0x1f270000, 0x0000, 0x0000,  8192, 10,  528,    0 },
+	{ "AT45DB321x", 0x1f270100, 0x0000, 0x0000,  8192, 10,  528,  512 },
+	{ "AT45DB641E", 0x1f280001, 0x0000, 0xff00, 32768,  9,  264,  256 },
+	{ "AT45DB642x", 0x1f280000, 0x0000, 0x0000,  8192, 11, 1056, 1024 },
 };
 
 static int
 at45d_get_status(device_t dev, uint8_t *status)
 {
 	uint8_t rxBuf[8], txBuf[8];
 	struct spi_command cmd;
 	int err;
 
 	memset(&cmd, 0, sizeof(cmd));
 	memset(txBuf, 0, sizeof(txBuf));
 	memset(rxBuf, 0, sizeof(rxBuf));
 
 	txBuf[0] = STATUS_REGISTER_READ;
 	cmd.tx_cmd = txBuf;
 	cmd.rx_cmd = rxBuf;
 	cmd.rx_cmd_sz = cmd.tx_cmd_sz = 2;
 	err = SPIBUS_TRANSFER(device_get_parent(dev), dev, &cmd);
 	*status = rxBuf[1];
 	return (err);
 }
 
 static int
-at45d_get_mfg_info(device_t dev, uint8_t *resp)
+at45d_get_mfg_info(device_t dev, struct at45d_mfg_info *resp)
 {
 	uint8_t rxBuf[8], txBuf[8];
 	struct spi_command cmd;
 	int err;
 
 	memset(&cmd, 0, sizeof(cmd));
 	memset(txBuf, 0, sizeof(txBuf));
 	memset(rxBuf, 0, sizeof(rxBuf));
 
 	txBuf[0] = MANUFACTURER_ID;
 	cmd.tx_cmd = &txBuf;
 	cmd.rx_cmd = &rxBuf;
-	cmd.tx_cmd_sz = cmd.rx_cmd_sz = 5;
+	cmd.tx_cmd_sz = cmd.rx_cmd_sz = 7;
 	err = SPIBUS_TRANSFER(device_get_parent(dev), dev, &cmd);
 	if (err)
 		return (err);
-	memcpy(resp, rxBuf + 1, 4);
+
+	resp->jedec_id = be32dec(rxBuf + 1);
+	resp->ext_id   = be16dec(rxBuf + 5);
+
 	return (0);
 }
 
 static int
 at45d_wait_ready(device_t dev, uint8_t *status)
 {
 	struct timeval now, tout;
 	int err;
 
 	getmicrouptime(&tout);
 	tout.tv_sec += 3;
 	do {
 		getmicrouptime(&now);
 		if (now.tv_sec > tout.tv_sec)
 			err = ETIMEDOUT;
 		else
 			err = at45d_get_status(dev, status);
 	} while (err == 0 && (*status & 0x80) == 0);
 	return (err);
 }
 
 static int
 at45d_probe(device_t dev)
 {
 	int rv;
 
 #ifdef FDT
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
 	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
 		return (ENXIO);
 
 	rv = BUS_PROBE_DEFAULT;
 #else
 	rv = BUS_PROBE_NOWILDCARD;
 #endif
 
 	device_set_desc(dev, "AT45D Flash Family");
 	return (rv);
 }
 
 static int
 at45d_attach(device_t dev)
 {
 	struct at45d_softc *sc;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
 	AT45D_LOCK_INIT(sc);
 
 	config_intrhook_oneshot(at45d_delayed_attach, sc);
 	return (0);
 }
 
 static int
 at45d_detach(device_t dev)
 {
 	struct at45d_softc *sc;
 	int err;
 
 	sc = device_get_softc(dev);
 	err = 0;
 
 	AT45D_LOCK(sc);
 	if (sc->taskstate == TSTATE_RUNNING) {
 		sc->taskstate = TSTATE_STOPPING;
 		wakeup(sc);
 		while (err == 0 && sc->taskstate != TSTATE_STOPPED) {
 			err = msleep(sc, &sc->sc_mtx, 0, "at45dt", hz * 3);
 			if (err != 0) {
 				sc->taskstate = TSTATE_RUNNING;
 				device_printf(sc->dev,
 				    "Failed to stop queue task\n");
 			}
 		}
 	}
 	AT45D_UNLOCK(sc);
 
 	if (err == 0 && sc->taskstate == TSTATE_STOPPED) {
 		disk_destroy(sc->disk);
 		bioq_flush(&sc->bio_queue, NULL, ENXIO);
 		AT45D_LOCK_DESTROY(sc);
 	}
 	return (err);
 }
 
 static void
 at45d_delayed_attach(void *xsc)
 {
 	struct at45d_softc *sc;
+	struct at45d_mfg_info mfginfo;
 	const struct at45d_flash_ident *ident;
 	u_int i;
 	uint32_t jedec;
 	uint16_t pagesize;
-	uint8_t buf[4], status;
+	uint8_t status;
 
 	sc = xsc;
 	ident = NULL;
 	jedec = 0;
 
 	if (at45d_wait_ready(sc->dev, &status) != 0) {
 		device_printf(sc->dev, "Error waiting for device-ready.\n");
 		return;
 	}
-	if (at45d_get_mfg_info(sc->dev, buf) != 0) {
+	if (at45d_get_mfg_info(sc->dev, &mfginfo) != 0) {
 		device_printf(sc->dev, "Failed to get ID.\n");
 		return;
 	}
-
-	jedec = buf[0] << 16 | buf[1] << 8 | buf[2];
 	for (i = 0; i < nitems(at45d_flash_devices); i++) {
-		if (at45d_flash_devices[i].jedec == jedec) {
-			ident = &at45d_flash_devices[i];
+		ident = &at45d_flash_devices[i];
+		if (mfginfo.jedec_id == ident->jedec && 
+		    (mfginfo.ext_id & ident->extmask) == ident->extid) {
 			break;
 		}
 	}
-	if (ident == NULL) {
+	if (i == nitems(at45d_flash_devices)) {
 		device_printf(sc->dev, "JEDEC 0x%x not in list.\n", jedec);
 		return;
 	}
 
 	sc->pagecount = ident->pagecount;
 	sc->pageoffset = ident->pageoffset;
 	if (ident->pagesize2n != 0 && (status & 0x01) != 0) {
 		sc->pageoffset -= 1;
 		pagesize = ident->pagesize2n;
 	} else
 		pagesize = ident->pagesize;
 	sc->pagesize = pagesize;
 
 	sc->disk = disk_alloc();
 	sc->disk->d_open = at45d_open;
 	sc->disk->d_close = at45d_close;
 	sc->disk->d_strategy = at45d_strategy;
-	sc->disk->d_name = "flash/spi";
+	sc->disk->d_name = "flash/at45d";
 	sc->disk->d_drv1 = sc;
 	sc->disk->d_maxsize = DFLTPHYS;
 	sc->disk->d_sectorsize = pagesize;
 	sc->disk->d_mediasize = pagesize * ident->pagecount;
 	sc->disk->d_unit = device_get_unit(sc->dev);
 	disk_create(sc->disk, DISK_VERSION);
+	disk_add_alias(sc->disk, "flash/spi");
 	bioq_init(&sc->bio_queue);
 	kproc_create(&at45d_task, sc, &sc->p, 0, 0, "task: at45d flash");
 	sc->taskstate = TSTATE_RUNNING;
-	device_printf(sc->dev, "%s, %d bytes per page, %d pages\n",
-	    ident->name, pagesize, ident->pagecount);
+	device_printf(sc->dev, "%s, %d bytes per page, %d pages; %d KBytes\n",
+	    ident->name, pagesize, ident->pagecount,
+	    (pagesize * ident->pagecount) / 1024);
 }
 
 static int
 at45d_open(struct disk *dp)
 {
 
 	return (0);
 }
 
 static int
 at45d_close(struct disk *dp)
 {
 
 	return (0);
 }
 
 static void
 at45d_strategy(struct bio *bp)
 {
 	struct at45d_softc *sc;
 
 	sc = (struct at45d_softc *)bp->bio_disk->d_drv1;
 	AT45D_LOCK(sc);
 	bioq_disksort(&sc->bio_queue, bp);
 	wakeup(sc);
 	AT45D_UNLOCK(sc);
 }
 
 static void
 at45d_task(void *arg)
 {
 	uint8_t rxBuf[8], txBuf[8];
 	struct at45d_softc *sc;
 	struct bio *bp;
 	struct spi_command cmd;
 	device_t dev, pdev;
 	caddr_t buf;
 	u_long len, resid;
 	u_int addr, berr, err, offset, page;
 	uint8_t status;
 
 	sc = (struct at45d_softc*)arg;
 	dev = sc->dev;
 	pdev = device_get_parent(dev);
 	memset(&cmd, 0, sizeof(cmd));
 	memset(txBuf, 0, sizeof(txBuf));
 	memset(rxBuf, 0, sizeof(rxBuf));
 	cmd.tx_cmd = txBuf;
 	cmd.rx_cmd = rxBuf;
 
 	for (;;) {
 		AT45D_LOCK(sc);
 		do {
 			if (sc->taskstate == TSTATE_STOPPING) {
 				sc->taskstate = TSTATE_STOPPED;
 				AT45D_UNLOCK(sc);
 				wakeup(sc);
 				kproc_exit(0);
 			}
 			bp = bioq_takefirst(&sc->bio_queue);
 			if (bp == NULL)
 				msleep(sc, &sc->sc_mtx, PRIBIO, "jobqueue", 0);
 		} while (bp == NULL);
 		AT45D_UNLOCK(sc);
 
 		berr = 0;
 		buf = bp->bio_data;
 		len = resid = bp->bio_bcount;
 		page = bp->bio_offset / sc->pagesize;
 		offset = bp->bio_offset % sc->pagesize;
 
 		switch (bp->bio_cmd) {
 		case BIO_READ:
 			txBuf[0] = CONTINUOUS_ARRAY_READ;
 			cmd.tx_cmd_sz = cmd.rx_cmd_sz = 8;
 			cmd.tx_data = cmd.rx_data = buf;
 			break;
 		case BIO_WRITE:
 			cmd.tx_cmd_sz = cmd.rx_cmd_sz = 4;
 			cmd.tx_data = cmd.rx_data = buf;
 			if (resid + offset > sc->pagesize)
 				len = sc->pagesize - offset;
 			break;
 		default:
 			berr = EINVAL;
 			goto out;
 		}
 
 		/*
 		 * NB: for BIO_READ, this loop is only traversed once.
 		 */
 		while (resid > 0) {
 			if (page > sc->pagecount) {
 				berr = EINVAL;
 				goto out;
 			}
 			addr = page << sc->pageoffset;
 			if (bp->bio_cmd == BIO_WRITE) {
 				if (len != sc->pagesize) {
 					txBuf[0] = BUFFER_TRANSFER;
 					txBuf[1] = ((addr >> 16) & 0xff);
 					txBuf[2] = ((addr >> 8) & 0xff);
 					txBuf[3] = 0;
 					cmd.tx_data_sz = cmd.rx_data_sz = 0;
 					err = SPIBUS_TRANSFER(pdev, dev,
 					    &cmd);
 					if (err == 0)
 						err = at45d_wait_ready(dev,
 						    &status);
 					if (err != 0) {
 						berr = EIO;
 						goto out;
 					}
 				}
 				txBuf[0] = PROGRAM_THROUGH_BUFFER;
 			}
 
 			addr += offset;
 			txBuf[1] = ((addr >> 16) & 0xff);
 			txBuf[2] = ((addr >> 8) & 0xff);
 			txBuf[3] = (addr & 0xff);
 			cmd.tx_data_sz = cmd.rx_data_sz = len;
 			err = SPIBUS_TRANSFER(pdev, dev, &cmd);
 			if (err == 0 && bp->bio_cmd != BIO_READ)
 				err = at45d_wait_ready(dev, &status);
 			if (err != 0) {
 				berr = EIO;
 				goto out;
 			}
 			if (bp->bio_cmd == BIO_WRITE) {
 				addr = page << sc->pageoffset;
 				txBuf[0] = BUFFER_COMPARE;
 				txBuf[1] = ((addr >> 16) & 0xff);
 				txBuf[2] = ((addr >> 8) & 0xff);
 				txBuf[3] = 0;
 				cmd.tx_data_sz = cmd.rx_data_sz = 0;
 				err = SPIBUS_TRANSFER(pdev, dev, &cmd);
 				if (err == 0)
 					err = at45d_wait_ready(dev, &status);
 				if (err != 0 || (status & 0x40) != 0) {
 					device_printf(dev, "comparing page "
 					    "%d failed (status=0x%x)\n", addr,
 					    status);
 					berr = EIO;
 					goto out;
 				}
 			}
 			page++;
 			buf += len;
 			offset = 0;
 			resid -= len;
 			if (resid > sc->pagesize)
 				len = sc->pagesize;
 			else
 				len = resid;
 			cmd.tx_data = cmd.rx_data = buf;
 		}
  out:
 		if (berr != 0) {
 			bp->bio_flags |= BIO_ERROR;
 			bp->bio_error = berr;
 		}
 		bp->bio_resid = resid;
 		biodone(bp);
 	}
 }
 
 static devclass_t at45d_devclass;
 
 static device_method_t at45d_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		at45d_probe),
 	DEVMETHOD(device_attach,	at45d_attach),
 	DEVMETHOD(device_detach,	at45d_detach),
 
 	DEVMETHOD_END
 };
 
 static driver_t at45d_driver = {
 	"at45d",
 	at45d_methods,
 	sizeof(struct at45d_softc),
 };
 
 DRIVER_MODULE(at45d, spibus, at45d_driver, at45d_devclass, NULL, NULL);
 MODULE_DEPEND(at45d, spibus, 1, 1, 1);
Index: projects/clang800-import/sys/dev/flash/mx25l.c
===================================================================
--- projects/clang800-import/sys/dev/flash/mx25l.c	(revision 344548)
+++ projects/clang800-import/sys/dev/flash/mx25l.c	(revision 344549)
@@ -1,689 +1,690 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (c) 2006 M. Warner Losh.
  * Copyright (c) 2009 Oleksandr Tymoshenko.  All rights reserved.
  * Copyright (c) 2018 Ian Lepore.  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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include "opt_platform.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <geom/geom_disk.h>
 
 #ifdef FDT
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/openfirm.h>
 #endif
 
 #include <dev/spibus/spi.h>
 #include "spibus_if.h"
 
 #include <dev/flash/mx25lreg.h>
 
 #define	FL_NONE			0x00
 #define	FL_ERASE_4K		0x01
 #define	FL_ERASE_32K		0x02
 #define	FL_ENABLE_4B_ADDR	0x04
 #define	FL_DISABLE_4B_ADDR	0x08
 
 /*
  * Define the sectorsize to be a smaller size rather than the flash
  * sector size. Trying to run FFS off of a 64k flash sector size
  * results in a completely un-usable system.
  */
 #define	MX25L_SECTORSIZE	512
 
 struct mx25l_flash_ident
 {
 	const char	*name;
 	uint8_t		manufacturer_id;
 	uint16_t	device_id;
 	unsigned int	sectorsize;
 	unsigned int	sectorcount;
 	unsigned int	flags;
 };
 
 struct mx25l_softc 
 {
 	device_t	sc_dev;
 	device_t	sc_parent;
 	uint8_t		sc_manufacturer_id;
 	uint16_t	sc_device_id;
 	unsigned int	sc_erasesize;
 	struct mtx	sc_mtx;
 	struct disk	*sc_disk;
 	struct proc	*sc_p;
 	struct bio_queue_head sc_bio_queue;
 	unsigned int	sc_flags;
 	unsigned int	sc_taskstate;
 	uint8_t		sc_dummybuf[FLASH_PAGE_SIZE];
 };
 
 #define	TSTATE_STOPPED	0
 #define	TSTATE_STOPPING	1
 #define	TSTATE_RUNNING	2
 
 #define M25PXX_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
 #define	M25PXX_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
 #define M25PXX_LOCK_INIT(_sc) \
 	mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), \
 	    "mx25l", MTX_DEF)
 #define M25PXX_LOCK_DESTROY(_sc)	mtx_destroy(&_sc->sc_mtx);
 #define M25PXX_ASSERT_LOCKED(_sc)	mtx_assert(&_sc->sc_mtx, MA_OWNED);
 #define M25PXX_ASSERT_UNLOCKED(_sc) mtx_assert(&_sc->sc_mtx, MA_NOTOWNED);
 
 /* disk routines */
 static int mx25l_open(struct disk *dp);
 static int mx25l_close(struct disk *dp);
 static int mx25l_ioctl(struct disk *, u_long, void *, int, struct thread *);
 static void mx25l_strategy(struct bio *bp);
 static int mx25l_getattr(struct bio *bp);
 static void mx25l_task(void *arg);
 
 static struct mx25l_flash_ident flash_devices[] = {
 	{ "en25f32",	0x1c, 0x3116, 64 * 1024, 64, FL_NONE },
 	{ "en25p32",	0x1c, 0x2016, 64 * 1024, 64, FL_NONE },
 	{ "en25p64",	0x1c, 0x2017, 64 * 1024, 128, FL_NONE },
 	{ "en25q32",	0x1c, 0x3016, 64 * 1024, 64, FL_NONE },
 	{ "en25q64",	0x1c, 0x3017, 64 * 1024, 128, FL_ERASE_4K },
 	{ "m25p32",	0x20, 0x2016, 64 * 1024, 64, FL_NONE },
 	{ "m25p64",	0x20, 0x2017, 64 * 1024, 128, FL_NONE },
 	{ "mx25l1606e", 0xc2, 0x2015, 64 * 1024, 32, FL_ERASE_4K},
 	{ "mx25ll32",	0xc2, 0x2016, 64 * 1024, 64, FL_NONE },
 	{ "mx25ll64",	0xc2, 0x2017, 64 * 1024, 128, FL_NONE },
 	{ "mx25ll128",	0xc2, 0x2018, 64 * 1024, 256, FL_ERASE_4K | FL_ERASE_32K },
 	{ "mx25ll256",	0xc2, 0x2019, 64 * 1024, 512, FL_ERASE_4K | FL_ERASE_32K | FL_ENABLE_4B_ADDR },
 	{ "s25fl032",	0x01, 0x0215, 64 * 1024, 64, FL_NONE },
 	{ "s25fl064",	0x01, 0x0216, 64 * 1024, 128, FL_NONE },
 	{ "s25fl128",	0x01, 0x2018, 64 * 1024, 256, FL_NONE },
 	{ "s25fl256s",	0x01, 0x0219, 64 * 1024, 512, FL_NONE },
 	{ "SST25VF010A", 0xbf, 0x2549, 4 * 1024, 32, FL_ERASE_4K | FL_ERASE_32K },
 	{ "SST25VF032B", 0xbf, 0x254a, 64 * 1024, 64, FL_ERASE_4K | FL_ERASE_32K },
 
 	/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
 	{ "w25x32",	0xef, 0x3016, 64 * 1024, 64, FL_ERASE_4K },
 	{ "w25x64",	0xef, 0x3017, 64 * 1024, 128, FL_ERASE_4K },
 	{ "w25q32",	0xef, 0x4016, 64 * 1024, 64, FL_ERASE_4K },
 	{ "w25q64",	0xef, 0x4017, 64 * 1024, 128, FL_ERASE_4K },
 	{ "w25q64bv",	0xef, 0x4017, 64 * 1024, 128, FL_ERASE_4K },
 	{ "w25q128",	0xef, 0x4018, 64 * 1024, 256, FL_ERASE_4K },
 	{ "w25q256",	0xef, 0x4019, 64 * 1024, 512, FL_ERASE_4K },
 
 	 /* Atmel */
 	{ "at25df641",  0x1f, 0x4800, 64 * 1024, 128, FL_ERASE_4K },
 
 	/* GigaDevice */
 	{ "gd25q64",	0xc8, 0x4017, 64 * 1024, 128, FL_ERASE_4K },
 };
 
 static int
 mx25l_wait_for_device_ready(struct mx25l_softc *sc)
 {
 	uint8_t txBuf[2], rxBuf[2];
 	struct spi_command cmd;
 	int err;
 
 	memset(&cmd, 0, sizeof(cmd));
 
 	do {
 		txBuf[0] = CMD_READ_STATUS;
 		cmd.tx_cmd = txBuf;
 		cmd.rx_cmd = rxBuf;
 		cmd.rx_cmd_sz = 2;
 		cmd.tx_cmd_sz = 2;
 		err = SPIBUS_TRANSFER(sc->sc_parent, sc->sc_dev, &cmd);
 	} while (err == 0 && (rxBuf[1] & STATUS_WIP));
 
 	return (err);
 }
 
 static struct mx25l_flash_ident*
 mx25l_get_device_ident(struct mx25l_softc *sc)
 {
 	uint8_t txBuf[8], rxBuf[8];
 	struct spi_command cmd;
 	uint8_t manufacturer_id;
 	uint16_t dev_id;
 	int err, i;
 
 	memset(&cmd, 0, sizeof(cmd));
 	memset(txBuf, 0, sizeof(txBuf));
 	memset(rxBuf, 0, sizeof(rxBuf));
 
 	txBuf[0] = CMD_READ_IDENT;
 	cmd.tx_cmd = &txBuf;
 	cmd.rx_cmd = &rxBuf;
 	/*
 	 * Some compatible devices has extended two-bytes ID
 	 * We'll use only manufacturer/deviceid atm
 	 */
 	cmd.tx_cmd_sz = 4;
 	cmd.rx_cmd_sz = 4;
 	err = SPIBUS_TRANSFER(sc->sc_parent, sc->sc_dev, &cmd);
 	if (err)
 		return (NULL);
 
 	manufacturer_id = rxBuf[1];
 	dev_id = (rxBuf[2] << 8) | (rxBuf[3]);
 
 	for (i = 0; i < nitems(flash_devices); i++) {
 		if ((flash_devices[i].manufacturer_id == manufacturer_id) &&
 		    (flash_devices[i].device_id == dev_id))
 			return &flash_devices[i];
 	}
 
 	device_printf(sc->sc_dev,
 	    "Unknown SPI flash device. Vendor: %02x, device id: %04x\n",
 	    manufacturer_id, dev_id);
 	return (NULL);
 }
 
 static int
 mx25l_set_writable(struct mx25l_softc *sc, int writable)
 {
 	uint8_t txBuf[1], rxBuf[1];
 	struct spi_command cmd;
 	int err;
 
 	memset(&cmd, 0, sizeof(cmd));
 	memset(txBuf, 0, sizeof(txBuf));
 	memset(rxBuf, 0, sizeof(rxBuf));
 
 	txBuf[0] = writable ? CMD_WRITE_ENABLE : CMD_WRITE_DISABLE;
 	cmd.tx_cmd = txBuf;
 	cmd.rx_cmd = rxBuf;
 	cmd.rx_cmd_sz = 1;
 	cmd.tx_cmd_sz = 1;
 	err = SPIBUS_TRANSFER(sc->sc_parent, sc->sc_dev, &cmd);
 	return (err);
 }
 
 static int
 mx25l_erase_cmd(struct mx25l_softc *sc, off_t sector)
 {
 	uint8_t txBuf[5], rxBuf[5];
 	struct spi_command cmd;
 	int err;
 
 	if ((err = mx25l_set_writable(sc, 1)) != 0)
 		return (err);
 
 	memset(&cmd, 0, sizeof(cmd));
 	memset(txBuf, 0, sizeof(txBuf));
 	memset(rxBuf, 0, sizeof(rxBuf));
 
 	cmd.tx_cmd = txBuf;
 	cmd.rx_cmd = rxBuf;
 
 	if (sc->sc_flags & FL_ERASE_4K)
 		txBuf[0] = CMD_BLOCK_4K_ERASE;
 	else if (sc->sc_flags & FL_ERASE_32K)
 		txBuf[0] = CMD_BLOCK_32K_ERASE;
 	else
 		txBuf[0] = CMD_SECTOR_ERASE;
 
 	if (sc->sc_flags & FL_ENABLE_4B_ADDR) {
 		cmd.rx_cmd_sz = 5;
 		cmd.tx_cmd_sz = 5;
 		txBuf[1] = ((sector >> 24) & 0xff);
 		txBuf[2] = ((sector >> 16) & 0xff);
 		txBuf[3] = ((sector >> 8) & 0xff);
 		txBuf[4] = (sector & 0xff);
 	} else {
 		cmd.rx_cmd_sz = 4;
 		cmd.tx_cmd_sz = 4;
 		txBuf[1] = ((sector >> 16) & 0xff);
 		txBuf[2] = ((sector >> 8) & 0xff);
 		txBuf[3] = (sector & 0xff);
 	}
 	if ((err = SPIBUS_TRANSFER(sc->sc_parent, sc->sc_dev, &cmd)) != 0)
 		return (err);
 	err = mx25l_wait_for_device_ready(sc);
 	return (err);
 }
 
 static int
 mx25l_write(struct mx25l_softc *sc, off_t offset, caddr_t data, off_t count)
 {
 	uint8_t txBuf[8], rxBuf[8];
 	struct spi_command cmd;
 	off_t bytes_to_write;
 	int err = 0;
 
 	if (sc->sc_flags & FL_ENABLE_4B_ADDR) {
 		cmd.tx_cmd_sz = 5;
 		cmd.rx_cmd_sz = 5;
 	} else {
 		cmd.tx_cmd_sz = 4;
 		cmd.rx_cmd_sz = 4;
 	}
 
 	/*
 	 * Writes must be aligned to the erase sectorsize, since blocks are
 	 * fully erased before they're written to.
 	 */
 	if (count % sc->sc_erasesize != 0 || offset % sc->sc_erasesize != 0)
 		return (EIO);
 
 	/*
 	 * Maximum write size for CMD_PAGE_PROGRAM is FLASH_PAGE_SIZE, so loop
 	 * to write chunks of FLASH_PAGE_SIZE bytes each.
 	 */
 	while (count != 0) {
 		/* If we crossed a sector boundary, erase the next sector. */
 		if (((offset) % sc->sc_erasesize) == 0) {
 			err = mx25l_erase_cmd(sc, offset);
 			if (err)
 				break;
 		}
 
 		txBuf[0] = CMD_PAGE_PROGRAM;
 		if (sc->sc_flags & FL_ENABLE_4B_ADDR) {
 			txBuf[1] = (offset >> 24) & 0xff;
 			txBuf[2] = (offset >> 16) & 0xff;
 			txBuf[3] = (offset >> 8) & 0xff;
 			txBuf[4] = offset & 0xff;
 		} else {
 			txBuf[1] = (offset >> 16) & 0xff;
 			txBuf[2] = (offset >> 8) & 0xff;
 			txBuf[3] = offset & 0xff;
 		}
 
 		bytes_to_write = MIN(FLASH_PAGE_SIZE, count);
 		cmd.tx_cmd = txBuf;
 		cmd.rx_cmd = rxBuf;
 		cmd.tx_data = data;
 		cmd.rx_data = sc->sc_dummybuf;
 		cmd.tx_data_sz = (uint32_t)bytes_to_write;
 		cmd.rx_data_sz = (uint32_t)bytes_to_write;
 
 		/*
 		 * Each completed write operation resets WEL (write enable
 		 * latch) to disabled state, so we re-enable it here.
 		 */
 		if ((err = mx25l_wait_for_device_ready(sc)) != 0)
 			break;
 		if ((err = mx25l_set_writable(sc, 1)) != 0)
 			break;
 
 		err = SPIBUS_TRANSFER(sc->sc_parent, sc->sc_dev, &cmd);
 		if (err != 0)
 			break;
 		err = mx25l_wait_for_device_ready(sc);
 		if (err)
 			break;
 
 		data   += bytes_to_write;
 		offset += bytes_to_write;
 		count  -= bytes_to_write;
 	}
 
 	return (err);
 }
 
 static int
 mx25l_read(struct mx25l_softc *sc, off_t offset, caddr_t data, off_t count)
 {
 	uint8_t txBuf[8], rxBuf[8];
 	struct spi_command cmd;
 	int err = 0;
 
 	/*
 	 * Enforce that reads are aligned to the disk sectorsize, not the
 	 * erase sectorsize.  In this way, smaller read IO is possible,
 	 * dramatically speeding up filesystem/geom_compress access.
 	 */
 	if (count % sc->sc_disk->d_sectorsize != 0 ||
 	    offset % sc->sc_disk->d_sectorsize != 0)
 		return (EIO);
 
 	txBuf[0] = CMD_FAST_READ;
 	if (sc->sc_flags & FL_ENABLE_4B_ADDR) {
 		cmd.tx_cmd_sz = 6;
 		cmd.rx_cmd_sz = 6;
 
 		txBuf[1] = (offset >> 24) & 0xff;
 		txBuf[2] = (offset >> 16) & 0xff;
 		txBuf[3] = (offset >> 8) & 0xff;
 		txBuf[4] = offset & 0xff;
 		/* Dummy byte */
 		txBuf[5] = 0;
 	} else {
 		cmd.tx_cmd_sz = 5;
 		cmd.rx_cmd_sz = 5;
 
 		txBuf[1] = (offset >> 16) & 0xff;
 		txBuf[2] = (offset >> 8) & 0xff;
 		txBuf[3] = offset & 0xff;
 		/* Dummy byte */
 		txBuf[4] = 0;
 	}
 
 	cmd.tx_cmd = txBuf;
 	cmd.rx_cmd = rxBuf;
 	cmd.tx_data = data;
 	cmd.rx_data = data;
 	cmd.tx_data_sz = count;
 	cmd.rx_data_sz = count;
 
 	err = SPIBUS_TRANSFER(sc->sc_parent, sc->sc_dev, &cmd);
 	return (err);
 }
 
 static int
 mx25l_set_4b_mode(struct mx25l_softc *sc, uint8_t command)
 {
 	uint8_t txBuf[1], rxBuf[1];
 	struct spi_command cmd;
 	int err;
 
 	memset(&cmd, 0, sizeof(cmd));
 	memset(txBuf, 0, sizeof(txBuf));
 	memset(rxBuf, 0, sizeof(rxBuf));
 
 	cmd.tx_cmd_sz = cmd.rx_cmd_sz = 1;
 
 	cmd.tx_cmd = txBuf;
 	cmd.rx_cmd = rxBuf;
 
 	txBuf[0] = command;
 
 	if ((err = SPIBUS_TRANSFER(sc->sc_parent, sc->sc_dev, &cmd)) == 0)
 		err = mx25l_wait_for_device_ready(sc);
 
 	return (err);
 }
 
 #ifdef	FDT
 static struct ofw_compat_data compat_data[] = {
 	{ "st,m25p",		1 },
 	{ "jedec,spi-nor",	1 },
 	{ NULL,			0 },
 };
 #endif
 
 static int
 mx25l_probe(device_t dev)
 {
 #ifdef FDT
 	int i;
 
 	if (!ofw_bus_status_okay(dev))
 		return (ENXIO);
 
 	/* First try to match the compatible property to the compat_data */
 	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 1)
 		goto found;
 
 	/*
 	 * Next, try to find a compatible device using the names in the
 	 * flash_devices structure
 	 */
 	for (i = 0; i < nitems(flash_devices); i++)
 		if (ofw_bus_is_compatible(dev, flash_devices[i].name))
 			goto found;
 
 	return (ENXIO);
 found:
 #endif
 	device_set_desc(dev, "M25Pxx Flash Family");
 
 	return (0);
 }
 
 static int
 mx25l_attach(device_t dev)
 {
 	struct mx25l_softc *sc;
 	struct mx25l_flash_ident *ident;
 	int err;
 
 	sc = device_get_softc(dev);
 	sc->sc_dev = dev;
 	sc->sc_parent = device_get_parent(sc->sc_dev);
 
 	M25PXX_LOCK_INIT(sc);
 
 	ident = mx25l_get_device_ident(sc);
 	if (ident == NULL)
 		return (ENXIO);
 
 	if ((err = mx25l_wait_for_device_ready(sc)) != 0)
 		return (err);
 
 	sc->sc_flags = ident->flags;
 
 	if (sc->sc_flags & FL_ERASE_4K)
 		sc->sc_erasesize = 4 * 1024;
 	else if (sc->sc_flags & FL_ERASE_32K)
 		sc->sc_erasesize = 32 * 1024;
 	else
 		sc->sc_erasesize = ident->sectorsize;
 
 	if (sc->sc_flags & FL_ENABLE_4B_ADDR) {
 		if ((err = mx25l_set_4b_mode(sc, CMD_ENTER_4B_MODE)) != 0)
 			return (err);
 	} else if (sc->sc_flags & FL_DISABLE_4B_ADDR) {
 		if ((err = mx25l_set_4b_mode(sc, CMD_EXIT_4B_MODE)) != 0)
 			return (err);
 	}
 
 	sc->sc_disk = disk_alloc();
 	sc->sc_disk->d_open = mx25l_open;
 	sc->sc_disk->d_close = mx25l_close;
 	sc->sc_disk->d_strategy = mx25l_strategy;
 	sc->sc_disk->d_getattr = mx25l_getattr;
 	sc->sc_disk->d_ioctl = mx25l_ioctl;
-	sc->sc_disk->d_name = "flash/spi";
+	sc->sc_disk->d_name = "flash/mx25l";
 	sc->sc_disk->d_drv1 = sc;
 	sc->sc_disk->d_maxsize = DFLTPHYS;
 	sc->sc_disk->d_sectorsize = MX25L_SECTORSIZE;
 	sc->sc_disk->d_mediasize = ident->sectorsize * ident->sectorcount;
 	sc->sc_disk->d_stripesize = sc->sc_erasesize;
 	sc->sc_disk->d_unit = device_get_unit(sc->sc_dev);
 	sc->sc_disk->d_dump = NULL;		/* NB: no dumps */
 	strlcpy(sc->sc_disk->d_descr, ident->name,
 	    sizeof(sc->sc_disk->d_descr));
 
 	disk_create(sc->sc_disk, DISK_VERSION);
+	disk_add_alias(sc->sc_disk, "flash/spi");
 	bioq_init(&sc->sc_bio_queue);
 
 	kproc_create(&mx25l_task, sc, &sc->sc_p, 0, 0, "task: mx25l flash");
 	sc->sc_taskstate = TSTATE_RUNNING;
 
 	device_printf(sc->sc_dev, 
 	    "device type %s, size %dK in %d sectors of %dK, erase size %dK\n",
 	    ident->name,
 	    ident->sectorcount * ident->sectorsize / 1024,
 	    ident->sectorcount, ident->sectorsize / 1024,
 	    sc->sc_erasesize / 1024);
 
 	return (0);
 }
 
 static int
 mx25l_detach(device_t dev)
 {
 	struct mx25l_softc *sc;
 	int err;
 
 	sc = device_get_softc(dev);
 	err = 0;
 
 	M25PXX_LOCK(sc);
 	if (sc->sc_taskstate == TSTATE_RUNNING) {
 		sc->sc_taskstate = TSTATE_STOPPING;
 		wakeup(sc);
 		while (err == 0 && sc->sc_taskstate != TSTATE_STOPPED) {
 			err = msleep(sc, &sc->sc_mtx, 0, "mx25dt", hz * 3);
 			if (err != 0) {
 				sc->sc_taskstate = TSTATE_RUNNING;
 				device_printf(sc->sc_dev,
 				    "Failed to stop queue task\n");
 			}
 		}
 	}
 	M25PXX_UNLOCK(sc);
 
 	if (err == 0 && sc->sc_taskstate == TSTATE_STOPPED) {
 		disk_destroy(sc->sc_disk);
 		bioq_flush(&sc->sc_bio_queue, NULL, ENXIO);
 		M25PXX_LOCK_DESTROY(sc);
 	}
 	return (err);
 }
 
 static int
 mx25l_open(struct disk *dp)
 {
 	return (0);
 }
 
 static int
 mx25l_close(struct disk *dp)
 {
 
 	return (0);
 }
 
 static int
 mx25l_ioctl(struct disk *dp, u_long cmd, void *data, int fflag,
 	struct thread *td)
 {
 
 	return (EINVAL);
 }
 
 static void
 mx25l_strategy(struct bio *bp)
 {
 	struct mx25l_softc *sc;
 
 	sc = (struct mx25l_softc *)bp->bio_disk->d_drv1;
 	M25PXX_LOCK(sc);
 	bioq_disksort(&sc->sc_bio_queue, bp);
 	wakeup(sc);
 	M25PXX_UNLOCK(sc);
 }
 
 static int
 mx25l_getattr(struct bio *bp)
 {
 	struct mx25l_softc *sc;
 	device_t dev;
 
 	if (bp->bio_disk == NULL || bp->bio_disk->d_drv1 == NULL)
 		return (ENXIO);
 
 	sc = bp->bio_disk->d_drv1;
 	dev = sc->sc_dev;
 
 	if (strcmp(bp->bio_attribute, "SPI::device") == 0) {
 		if (bp->bio_length != sizeof(dev))
 			return (EFAULT);
 		bcopy(&dev, bp->bio_data, sizeof(dev));
 	} else
 		return (-1);
 	return (0);
 }
 
 static void
 mx25l_task(void *arg)
 {
 	struct mx25l_softc *sc = (struct mx25l_softc*)arg;
 	struct bio *bp;
 	device_t dev;
 
 	for (;;) {
 		dev = sc->sc_dev;
 		M25PXX_LOCK(sc);
 		do {
 			if (sc->sc_taskstate == TSTATE_STOPPING) {
 				sc->sc_taskstate = TSTATE_STOPPED;
 				M25PXX_UNLOCK(sc);
 				wakeup(sc);
 				kproc_exit(0);
 			}
 			bp = bioq_first(&sc->sc_bio_queue);
 			if (bp == NULL)
 				msleep(sc, &sc->sc_mtx, PRIBIO, "mx25jq", 0);
 		} while (bp == NULL);
 		bioq_remove(&sc->sc_bio_queue, bp);
 		M25PXX_UNLOCK(sc);
 
 		switch (bp->bio_cmd) {
 		case BIO_READ:
 			bp->bio_error = mx25l_read(sc, bp->bio_offset, 
 			    bp->bio_data, bp->bio_bcount);
 			break;
 		case BIO_WRITE:
 			bp->bio_error = mx25l_write(sc, bp->bio_offset, 
 			    bp->bio_data, bp->bio_bcount);
 			break;
 		default:
 			bp->bio_error = EINVAL;
 		}
 
 
 		biodone(bp);
 	}
 }
 
 static devclass_t mx25l_devclass;
 
 static device_method_t mx25l_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		mx25l_probe),
 	DEVMETHOD(device_attach,	mx25l_attach),
 	DEVMETHOD(device_detach,	mx25l_detach),
 
 	{ 0, 0 }
 };
 
 static driver_t mx25l_driver = {
 	"mx25l",
 	mx25l_methods,
 	sizeof(struct mx25l_softc),
 };
 
 DRIVER_MODULE(mx25l, spibus, mx25l_driver, mx25l_devclass, 0, 0);
 MODULE_DEPEND(mx25l, spibus, 1, 1, 1);
 #ifdef	FDT
 SPIBUS_PNP_INFO(compat_data);
 #endif
Index: projects/clang800-import/sys/kern/kern_kcov.c
===================================================================
--- projects/clang800-import/sys/kern/kern_kcov.c	(revision 344548)
+++ projects/clang800-import/sys/kern/kern_kcov.c	(revision 344549)
@@ -1,575 +1,580 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
  * Copyright (C) 2018 The FreeBSD Foundation. All rights reserved.
  * Copyright (C) 2018, 2019 Andrew Turner
  *
  * This software was developed by Mitchell Horne under sponsorship of
  * the FreeBSD Foundation.
  *
  * This software was developed by SRI International and the University of
  * Cambridge Computer Laboratory under DARPA/AFRL contract FA8750-10-C-0237
  * ("CTSRD"), as part of the DARPA CRASH research programme.
  *
  * 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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
  *
  * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/kcov.h>
 #include <sys/kernel.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/sysctl.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 #include <vm/vm_param.h>
 
 MALLOC_DEFINE(M_KCOV_INFO, "kcovinfo", "KCOV info type");
 
 #define	KCOV_ELEMENT_SIZE	sizeof(uint64_t)
 
 /*
  * To know what the code can safely perform at any point in time we use a
  * state machine. In the normal case the state transitions are:
  *
  * OPEN -> READY -> RUNNING -> DYING
  *  |       | ^        |        ^ ^
  *  |       | +--------+        | |
  *  |       +-------------------+ |
  *  +-----------------------------+
  *
  * The states are:
  *  OPEN:   The kcov fd has been opened, but no buffer is available to store
  *          coverage data.
  *  READY:  The buffer to store coverage data has been allocated. Userspace
  *          can set this by using ioctl(fd, KIOSETBUFSIZE, entries);. When
  *          this has been set the buffer can be written to by the kernel,
  *          and mmaped by userspace.
  * RUNNING: The coverage probes are able to store coverage data in the buffer.
  *          This is entered with ioctl(fd, KIOENABLE, mode);. The READY state
  *          can be exited by ioctl(fd, KIODISABLE); or exiting the thread to
  *          return to the READY state to allow tracing to be reused, or by
  *          closing the kcov fd to enter the DYING state.
  * DYING:   The fd has been closed. All states can enter into this state when
  *          userspace closes the kcov fd.
  *
  * We need to be careful when moving into and out of the RUNNING state. As
  * an interrupt may happen while this is happening the ordering of memory
  * operations is important so struct kcov_info is valid for the tracing
  * functions.
  *
  * When moving into the RUNNING state prior stores to struct kcov_info need
  * to be observed before the state is set. This allows for interrupts that
  * may call into one of the coverage functions to fire at any point while
  * being enabled and see a consistent struct kcov_info.
  *
  * When moving out of the RUNNING state any later stores to struct kcov_info
  * need to be observed after the state is set. As with entering this is to
  * present a consistent struct kcov_info to interrupts.
  */
 typedef enum {
 	KCOV_STATE_INVALID,
 	KCOV_STATE_OPEN,	/* The device is open, but with no buffer */
 	KCOV_STATE_READY,	/* The buffer has been allocated */
 	KCOV_STATE_RUNNING,	/* Recording trace data */
 	KCOV_STATE_DYING,	/* The fd was closed */
 } kcov_state_t;
 
 /*
  * (l) Set while holding the kcov_lock mutex and not in the RUNNING state.
  * (o) Only set once while in the OPEN state. Cleaned up while in the DYING
  *     state, and with no thread associated with the struct kcov_info.
  * (s) Set atomically to enter or exit the RUNNING state, non-atomically
  *     otherwise. See above for a description of the other constraints while
  *     moving into or out of the RUNNING state.
  */
 struct kcov_info {
 	struct thread	*thread;	/* (l) */
 	vm_object_t	bufobj;		/* (o) */
 	vm_offset_t	kvaddr;		/* (o) */
 	size_t		entries;	/* (o) */
 	size_t		bufsize;	/* (o) */
 	kcov_state_t	state;		/* (s) */
 	int		mode;		/* (l) */
 };
 
 /* Prototypes */
 static d_open_t		kcov_open;
 static d_close_t	kcov_close;
 static d_mmap_single_t	kcov_mmap_single;
 static d_ioctl_t	kcov_ioctl;
 
 static int  kcov_alloc(struct kcov_info *info, size_t entries);
 static void kcov_free(struct kcov_info *info);
 static void kcov_init(const void *unused);
 
 static struct cdevsw kcov_cdevsw = {
 	.d_version =	D_VERSION,
 	.d_open =	kcov_open,
 	.d_close =	kcov_close,
 	.d_mmap_single = kcov_mmap_single,
 	.d_ioctl =	kcov_ioctl,
 	.d_name =	"kcov",
 };
 
 SYSCTL_NODE(_kern, OID_AUTO, kcov, CTLFLAG_RW, 0, "Kernel coverage");
 
 static u_int kcov_max_entries = KCOV_MAXENTRIES;
 SYSCTL_UINT(_kern_kcov, OID_AUTO, max_entries, CTLFLAG_RW,
     &kcov_max_entries, 0,
     "Maximum number of entries in the kcov buffer");
 
 static struct mtx kcov_lock;
 static int active_count;
 
 static struct kcov_info *
 get_kinfo(struct thread *td)
 {
 	struct kcov_info *info;
 
 	/* We might have a NULL thread when releasing the secondary CPUs */
 	if (td == NULL)
 		return (NULL);
 
 	/*
 	 * We are in an interrupt, stop tracing as it is not explicitly
 	 * part of a syscall.
 	 */
 	if (td->td_intr_nesting_level > 0 || td->td_intr_frame != NULL)
 		return (NULL);
 
 	/*
 	 * If info is NULL or the state is not running we are not tracing.
 	 */
 	info = td->td_kcov_info;
 	if (info == NULL ||
 	    atomic_load_acq_int(&info->state) != KCOV_STATE_RUNNING)
 		return (NULL);
 
 	return (info);
 }
 
 static void
 trace_pc(uintptr_t ret)
 {
 	struct thread *td;
 	struct kcov_info *info;
 	uint64_t *buf, index;
 
 	td = curthread;
 	info = get_kinfo(td);
 	if (info == NULL)
 		return;
 
 	/*
 	 * Check we are in the PC-trace mode.
 	 */
 	if (info->mode != KCOV_MODE_TRACE_PC)
 		return;
 
 	KASSERT(info->kvaddr != 0,
 	    ("__sanitizer_cov_trace_pc: NULL buf while running"));
 
 	buf = (uint64_t *)info->kvaddr;
 
 	/* The first entry of the buffer holds the index */
 	index = buf[0];
 	if (index + 2 > info->entries)
 		return;
 
 	buf[index + 1] = ret;
 	buf[0] = index + 1;
 }
 
 static bool
 trace_cmp(uint64_t type, uint64_t arg1, uint64_t arg2, uint64_t ret)
 {
 	struct thread *td;
 	struct kcov_info *info;
 	uint64_t *buf, index;
 
 	td = curthread;
 	info = get_kinfo(td);
 	if (info == NULL)
 		return (false);
 
 	/*
 	 * Check we are in the comparison-trace mode.
 	 */
 	if (info->mode != KCOV_MODE_TRACE_CMP)
 		return (false);
 
 	KASSERT(info->kvaddr != 0,
 	    ("__sanitizer_cov_trace_pc: NULL buf while running"));
 
 	buf = (uint64_t *)info->kvaddr;
 
 	/* The first entry of the buffer holds the index */
 	index = buf[0];
 
 	/* Check we have space to store all elements */
 	if (index * 4 + 4 + 1 > info->entries)
 		return (false);
 
-	buf[index * 4 + 1] = type;
-	buf[index * 4 + 2] = arg1;
-	buf[index * 4 + 3] = arg2;
-	buf[index * 4 + 4] = ret;
-	buf[0] = index + 1;
+	while (1) {
+		buf[index * 4 + 1] = type;
+		buf[index * 4 + 2] = arg1;
+		buf[index * 4 + 3] = arg2;
+		buf[index * 4 + 4] = ret;
+
+		if (atomic_cmpset_64(&buf[0], index, index + 1))
+			break;
+		buf[0] = index;
+	}
 
 	return (true);
 }
 
 /*
  * The fd is being closed, cleanup everything we can.
  */
 static void
 kcov_mmap_cleanup(void *arg)
 {
 	struct kcov_info *info = arg;
 	struct thread *thread;
 
 	mtx_lock_spin(&kcov_lock);
 	/*
 	 * Move to KCOV_STATE_DYING to stop adding new entries.
 	 *
 	 * If the thread is running we need to wait until thread exit to
 	 * clean up as it may currently be adding a new entry. If this is
 	 * the case being in KCOV_STATE_DYING will signal that the buffer
 	 * needs to be cleaned up.
 	 */
 	atomic_store_int(&info->state, KCOV_STATE_DYING);
 	atomic_thread_fence_seq_cst();
 	thread = info->thread;
 	mtx_unlock_spin(&kcov_lock);
 
 	if (thread != NULL)
 		return;
 
 	/*
 	 * We can safely clean up the info struct as it is in the
 	 * KCOV_STATE_DYING state with no thread associated.
 	 *
 	 * The KCOV_STATE_DYING stops new threads from using it.
 	 * The lack of a thread means nothing is currently using the buffers.
 	 */
 	kcov_free(info);
 }
 
 static int
 kcov_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 {
 	struct kcov_info *info;
 	int error;
 
 	info = malloc(sizeof(struct kcov_info), M_KCOV_INFO, M_ZERO | M_WAITOK);
 	info->state = KCOV_STATE_OPEN;
 	info->thread = NULL;
 	info->mode = -1;
 
 	if ((error = devfs_set_cdevpriv(info, kcov_mmap_cleanup)) != 0)
 		kcov_mmap_cleanup(info);
 
 	return (error);
 }
 
 static int
 kcov_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
 {
 	struct kcov_info *info;
 	int error;
 
 
 	if ((error = devfs_get_cdevpriv((void **)&info)) != 0)
 		return (error);
 
 	KASSERT(info != NULL, ("kcov_close with no kcov_info structure"));
 
 	/* Trying to close, but haven't disabled */
 	if (info->state == KCOV_STATE_RUNNING)
 		return (EBUSY);
 
 	return (0);
 }
 
 static int
 kcov_mmap_single(struct cdev *dev, vm_ooffset_t *offset, vm_size_t size,
     struct vm_object **object, int nprot)
 {
 	struct kcov_info *info;
 	int error;
 
 	if ((nprot & (PROT_EXEC | PROT_READ | PROT_WRITE)) !=
 	    (PROT_READ | PROT_WRITE))
 		return (EINVAL);
 
 	if ((error = devfs_get_cdevpriv((void **)&info)) != 0)
 		return (error);
 
 	if (info->kvaddr == 0 || size / KCOV_ELEMENT_SIZE != info->entries)
 		return (EINVAL);
 
 	vm_object_reference(info->bufobj);
 	*offset = 0;
 	*object = info->bufobj;
 	return (0);
 }
 
 static int
 kcov_alloc(struct kcov_info *info, size_t entries)
 {
 	size_t n, pages;
 	vm_page_t m;
 
 	KASSERT(info->kvaddr == 0, ("kcov_alloc: Already have a buffer"));
 	KASSERT(info->state == KCOV_STATE_OPEN,
 	    ("kcov_alloc: Not in open state (%x)", info->state));
 
 	if (entries < 2 || entries > kcov_max_entries)
 		return (EINVAL);
 
 	/* Align to page size so mmap can't access other kernel memory */
 	info->bufsize = roundup2(entries * KCOV_ELEMENT_SIZE, PAGE_SIZE);
 	pages = info->bufsize / PAGE_SIZE;
 
 	if ((info->kvaddr = kva_alloc(info->bufsize)) == 0)
 		return (ENOMEM);
 
 	info->bufobj = vm_pager_allocate(OBJT_PHYS, 0, info->bufsize,
 	    PROT_READ | PROT_WRITE, 0, curthread->td_ucred);
 
 	VM_OBJECT_WLOCK(info->bufobj);
 	for (n = 0; n < pages; n++) {
 		m = vm_page_grab(info->bufobj, n,
 		    VM_ALLOC_NOBUSY | VM_ALLOC_ZERO | VM_ALLOC_WIRED);
 		m->valid = VM_PAGE_BITS_ALL;
 		pmap_qenter(info->kvaddr + n * PAGE_SIZE, &m, 1);
 	}
 	VM_OBJECT_WUNLOCK(info->bufobj);
 
 	info->entries = entries;
 
 	return (0);
 }
 
 static void
 kcov_free(struct kcov_info *info)
 {
 	vm_page_t m;
 	size_t i;
 
 	if (info->kvaddr != 0) {
 		pmap_qremove(info->kvaddr, info->bufsize / PAGE_SIZE);
 		kva_free(info->kvaddr, info->bufsize);
 	}
 	if (info->bufobj != NULL) {
 		VM_OBJECT_WLOCK(info->bufobj);
 		m = vm_page_lookup(info->bufobj, 0);
 		for (i = 0; i < info->bufsize / PAGE_SIZE; i++) {
 			vm_page_lock(m);
 			vm_page_unwire_noq(m);
 			vm_page_unlock(m);
 
 			m = vm_page_next(m);
 		}
 		VM_OBJECT_WUNLOCK(info->bufobj);
 		vm_object_deallocate(info->bufobj);
 	}
 	free(info, M_KCOV_INFO);
 }
 
 static int
 kcov_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag __unused,
     struct thread *td)
 {
 	struct kcov_info *info;
 	int mode, error;
 
 	if ((error = devfs_get_cdevpriv((void **)&info)) != 0)
 		return (error);
 
 	if (cmd == KIOSETBUFSIZE) {
 		/*
 		 * Set the size of the coverage buffer. Should be called
 		 * before enabling coverage collection for that thread.
 		 */
 		if (info->state != KCOV_STATE_OPEN) {
 			return (EBUSY);
 		}
 		error = kcov_alloc(info, *(u_int *)data);
 		if (error == 0)
 			info->state = KCOV_STATE_READY;
 		return (error);
 	}
 
 	mtx_lock_spin(&kcov_lock);
 	switch (cmd) {
 	case KIOENABLE:
 		if (info->state != KCOV_STATE_READY) {
 			error = EBUSY;
 			break;
 		}
 		if (td->td_kcov_info != NULL) {
 			error = EINVAL;
 			break;
 		}
 		mode = *(int *)data;
 		if (mode != KCOV_MODE_TRACE_PC && mode != KCOV_MODE_TRACE_CMP) {
 			error = EINVAL;
 			break;
 		}
 
 		/* Lets hope nobody opens this 2 billion times */
 		KASSERT(active_count < INT_MAX,
 		    ("%s: Open too many times", __func__));
 		active_count++;
 		if (active_count == 1) {
 			cov_register_pc(&trace_pc);
 			cov_register_cmp(&trace_cmp);
 		}
 
 		KASSERT(info->thread == NULL,
 		    ("Enabling kcov when already enabled"));
 		info->thread = td;
 		info->mode = mode;
 		/*
 		 * Ensure the mode has been set before starting coverage
 		 * tracing.
 		 */
 		atomic_store_rel_int(&info->state, KCOV_STATE_RUNNING);
 		td->td_kcov_info = info;
 		break;
 	case KIODISABLE:
 		/* Only the currently enabled thread may disable itself */
 		if (info->state != KCOV_STATE_RUNNING ||
 		    info != td->td_kcov_info) {
 			error = EINVAL;
 			break;
 		}
 		KASSERT(active_count > 0, ("%s: Open count is zero", __func__));
 		active_count--;
 		if (active_count == 0) {
 			cov_unregister_pc();
 			cov_unregister_cmp();
 		}
 
 		td->td_kcov_info = NULL;
 		atomic_store_int(&info->state, KCOV_STATE_READY);
 		/*
 		 * Ensure we have exited the READY state before clearing the
 		 * rest of the info struct.
 		 */
 		atomic_thread_fence_rel();
 		info->mode = -1;
 		info->thread = NULL;
 		break;
 	default:
 		error = EINVAL;
 		break;
 	}
 	mtx_unlock_spin(&kcov_lock);
 
 	return (error);
 }
 
 static void
 kcov_thread_dtor(void *arg __unused, struct thread *td)
 {
 	struct kcov_info *info;
 
 	info = td->td_kcov_info;
 	if (info == NULL)
 		return;
 
 	mtx_lock_spin(&kcov_lock);
 	KASSERT(active_count > 0, ("%s: Open count is zero", __func__));
 	active_count--;
 	if (active_count == 0) {
 		cov_unregister_pc();
 		cov_unregister_cmp();
 	}
 	td->td_kcov_info = NULL;
 	if (info->state != KCOV_STATE_DYING) {
 		/*
 		 * The kcov file is still open. Mark it as unused and
 		 * wait for it to be closed before cleaning up.
 		 */
 		atomic_store_int(&info->state, KCOV_STATE_READY);
 		atomic_thread_fence_seq_cst();
 		/* This info struct is unused */
 		info->thread = NULL;
 		mtx_unlock_spin(&kcov_lock);
 		return;
 	}
 	mtx_unlock_spin(&kcov_lock);
 
 	/*
 	 * We can safely clean up the info struct as it is in the
 	 * KCOV_STATE_DYING state where the info struct is associated with
 	 * the current thread that's about to exit.
 	 *
 	 * The KCOV_STATE_DYING stops new threads from using it.
 	 * It also stops the current thread from trying to use the info struct.
 	 */
 	kcov_free(info);
 }
 
 static void
 kcov_init(const void *unused)
 {
 	struct make_dev_args args;
 	struct cdev *dev;
 
 	mtx_init(&kcov_lock, "kcov lock", NULL, MTX_SPIN);
 
 	make_dev_args_init(&args);
 	args.mda_devsw = &kcov_cdevsw;
 	args.mda_uid = UID_ROOT;
 	args.mda_gid = GID_WHEEL;
 	args.mda_mode = 0600;
 	if (make_dev_s(&args, &dev, "kcov") != 0) {
 		printf("%s", "Failed to create kcov device");
 		return;
 	}
 
 	EVENTHANDLER_REGISTER(thread_dtor, kcov_thread_dtor, NULL,
 	    EVENTHANDLER_PRI_ANY);
 }
 
 SYSINIT(kcovdev, SI_SUB_LAST, SI_ORDER_ANY, kcov_init, NULL);
Index: projects/clang800-import/sys/opencrypto/cbc_mac.c
===================================================================
--- projects/clang800-import/sys/opencrypto/cbc_mac.c	(revision 344548)
+++ projects/clang800-import/sys/opencrypto/cbc_mac.c	(revision 344549)
@@ -1,252 +1,268 @@
 /*
  * Copyright (c) 2018-2019 iXsystems Inc.  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.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <opencrypto/cbc_mac.h>
 #include <opencrypto/xform_auth.h>
 
 /*
  * Given two CCM_CBC_BLOCK_LEN blocks, xor
  * them into dst, and then encrypt dst.
  */
 static void
 xor_and_encrypt(struct aes_cbc_mac_ctx *ctx,
 		const uint8_t *src, uint8_t *dst)
 {
 	const uint64_t *b1;
 	uint64_t *b2;
 	uint64_t temp_block[CCM_CBC_BLOCK_LEN/sizeof(uint64_t)];
 
 	b1 = (const uint64_t*)src;
 	b2 = (uint64_t*)dst;
 
 	for (size_t count = 0;
 	     count < CCM_CBC_BLOCK_LEN/sizeof(uint64_t);
 	     count++) {
 		temp_block[count] = b1[count] ^ b2[count];
 	}
 	rijndaelEncrypt(ctx->keysched, ctx->rounds, (void*)temp_block, dst);
 }
 
 void
 AES_CBC_MAC_Init(struct aes_cbc_mac_ctx *ctx)
 {
 	bzero(ctx, sizeof(*ctx));
 }
 
 void
 AES_CBC_MAC_Setkey(struct aes_cbc_mac_ctx *ctx, const uint8_t *key, uint16_t klen)
 {
 	ctx->rounds = rijndaelKeySetupEnc(ctx->keysched, key, klen * 8);
 }
 
 /*
  * This is called to set the nonce, aka IV.
  * Before this call, the authDataLength and cryptDataLength fields
  * MUST have been set.  Sadly, there's no way to return an error.
  *
  * The CBC-MAC algorithm requires that the first block contain the
  * nonce, as well as information about the sizes and lengths involved.
  */
 void
 AES_CBC_MAC_Reinit(struct aes_cbc_mac_ctx *ctx, const uint8_t *nonce, uint16_t nonceLen)
 {
 	uint8_t b0[CCM_CBC_BLOCK_LEN];
 	uint8_t *bp = b0, flags = 0;
 	uint8_t L = 0;
 	uint64_t dataLength = ctx->cryptDataLength;
 	
 	KASSERT(ctx->authDataLength != 0 || ctx->cryptDataLength != 0,
 	    ("Auth Data and Data lengths cannot both be 0"));
 
 	KASSERT(nonceLen >= 7 && nonceLen <= 13,
 	    ("nonceLen must be between 7 and 13 bytes"));
 
 	ctx->nonce = nonce;
 	ctx->nonceLength = nonceLen;
 	
 	ctx->authDataCount = 0;
 	ctx->blockIndex = 0;
 	explicit_bzero(ctx->staging_block, sizeof(ctx->staging_block));
 	
 	/*
 	 * Need to determine the L field value.  This is the number of
 	 * bytes needed to specify the length of the message; the length
 	 * is whatever is left in the 16 bytes after specifying flags and
 	 * the nonce.
 	 */
 	L = 15 - nonceLen;
 	
 	flags = ((ctx->authDataLength > 0) << 6) +
 	    (((AES_CBC_MAC_HASH_LEN - 2) / 2) << 3) +
 	    L - 1;
 	/*
 	 * Now we need to set up the first block, which has flags, nonce,
 	 * and the message length.
 	 */
 	b0[0] = flags;
 	bcopy(nonce, b0 + 1, nonceLen);
 	bp = b0 + 1 + nonceLen;
 
 	/* Need to copy L' [aka L-1] bytes of cryptDataLength */
 	for (uint8_t *dst = b0 + sizeof(b0) - 1; dst >= bp; dst--) {
 		*dst = dataLength;
 		dataLength >>= 8;
 	}
 	/* Now need to encrypt b0 */
 	rijndaelEncrypt(ctx->keysched, ctx->rounds, b0, ctx->block);
 	/* If there is auth data, we need to set up the staging block */
 	if (ctx->authDataLength) {
+		size_t addLength;
 		if (ctx->authDataLength < ((1<<16) - (1<<8))) {
 			uint16_t sizeVal = htobe16(ctx->authDataLength);
 			bcopy(&sizeVal, ctx->staging_block, sizeof(sizeVal));
-			ctx->blockIndex = sizeof(sizeVal);
+			addLength = sizeof(sizeVal);
 		} else if (ctx->authDataLength < (1ULL<<32)) {
 			uint32_t sizeVal = htobe32(ctx->authDataLength);
 			ctx->staging_block[0] = 0xff;
 			ctx->staging_block[1] = 0xfe;
 			bcopy(&sizeVal, ctx->staging_block+2, sizeof(sizeVal));
-			ctx->blockIndex = 2 + sizeof(sizeVal);
+			addLength = 2 + sizeof(sizeVal);
 		} else {
 			uint64_t sizeVal = htobe64(ctx->authDataLength);
 			ctx->staging_block[0] = 0xff;
 			ctx->staging_block[1] = 0xff;
 			bcopy(&sizeVal, ctx->staging_block+2, sizeof(sizeVal));
-			ctx->blockIndex = 2 + sizeof(sizeVal);
+			addLength = 2 + sizeof(sizeVal);
 		}
+		ctx->blockIndex = addLength;
+		/*
+		 * The length descriptor goes into the AAD buffer, so we
+		 * need to account for it.
+		 */
+		ctx->authDataLength += addLength;
+		ctx->authDataCount = addLength;
 	}
 }
 
 int
 AES_CBC_MAC_Update(struct aes_cbc_mac_ctx *ctx, const uint8_t *data,
     uint16_t length)
 {
 	size_t copy_amt;
 	
 	/*
 	 * This will be called in one of two phases:
 	 * (1)  Applying authentication data, or
 	 * (2)  Applying the payload data.
 	 *
 	 * Because CBC-MAC puts the authentication data size before the
 	 * data, subsequent calls won't be block-size-aligned.  Which
 	 * complicates things a fair bit.
 	 *
 	 * The payload data doesn't have that problem.
 	 */
 				
 	if (ctx->authDataCount < ctx->authDataLength) {
 		/*
 		 * We need to process data as authentication data.
 		 * Since we may be out of sync, we may also need
 		 * to pad out the staging block.
 		 */
 		const uint8_t *ptr = data;
 		while (length > 0) {
 
 			copy_amt = MIN(length,
 			    sizeof(ctx->staging_block) - ctx->blockIndex);
 
 			bcopy(ptr, ctx->staging_block + ctx->blockIndex,
 			    copy_amt);
 			ptr += copy_amt;
 			length -= copy_amt;
 			ctx->authDataCount += copy_amt;
 			ctx->blockIndex += copy_amt;
 			ctx->blockIndex %= sizeof(ctx->staging_block);
-			if (ctx->authDataCount == ctx->authDataLength)
-				length = 0;
+
 			if (ctx->blockIndex == 0 ||
-			    ctx->authDataCount >= ctx->authDataLength) {
+			    ctx->authDataCount == ctx->authDataLength) {
 				/*
 				 * We're done with this block, so we
 				 * xor staging_block with block, and then
 				 * encrypt it.
 				 */
 				xor_and_encrypt(ctx, ctx->staging_block, ctx->block);
 				bzero(ctx->staging_block, sizeof(ctx->staging_block));
 				ctx->blockIndex = 0;
+				if (ctx->authDataCount >= ctx->authDataLength)
+					break;
 			}
 		}
+		/*
+		 * We'd like to be able to check length == 0 and return
+		 * here, but the way OCF calls us, length is always
+		 * blksize (16, in this case).  So we have to count on
+		 * the fact that OCF calls us separately for the AAD and
+		 * for the real data.
+		 */
 		return (0);
 	}
 	/*
 	 * If we're here, then we're encoding payload data.
 	 * This is marginally easier, except that _Update can
 	 * be called with non-aligned update lengths. As a result,
 	 * we still need to use the staging block.
 	 */
 	KASSERT((length + ctx->cryptDataCount) <= ctx->cryptDataLength,
 	    ("More encryption data than allowed"));
 
 	while (length) {
 		uint8_t *ptr;
 		
 		copy_amt = MIN(sizeof(ctx->staging_block) - ctx->blockIndex,
 		    length);
 		ptr = ctx->staging_block + ctx->blockIndex;
 		bcopy(data, ptr, copy_amt);
 		data += copy_amt;
 		ctx->blockIndex += copy_amt;
 		ctx->cryptDataCount += copy_amt;
 		length -= copy_amt;
 		if (ctx->blockIndex == sizeof(ctx->staging_block)) {
 			/* We've got a full block */
 			xor_and_encrypt(ctx, ctx->staging_block, ctx->block);
 			ctx->blockIndex = 0;
 			bzero(ctx->staging_block, sizeof(ctx->staging_block));
 		}
 	}
 	return (0);
 }
 
 void
 AES_CBC_MAC_Final(uint8_t *buf, struct aes_cbc_mac_ctx *ctx)
 {
 	uint8_t s0[CCM_CBC_BLOCK_LEN];
 	
 	/*
 	 * We first need to check to see if we've got any data
 	 * left over to encrypt.
 	 */
 	if (ctx->blockIndex != 0) {
 		xor_and_encrypt(ctx, ctx->staging_block, ctx->block);
 		ctx->cryptDataCount += ctx->blockIndex;
 		ctx->blockIndex = 0;
 		explicit_bzero(ctx->staging_block, sizeof(ctx->staging_block));
 	}
 	bzero(s0, sizeof(s0));
 	s0[0] = (15 - ctx->nonceLength) - 1;
 	bcopy(ctx->nonce, s0 + 1, ctx->nonceLength);
 	rijndaelEncrypt(ctx->keysched, ctx->rounds, s0, s0);
 	for (size_t indx = 0; indx < AES_CBC_MAC_HASH_LEN; indx++)
 		buf[indx] = ctx->block[indx] ^ s0[indx];
 	explicit_bzero(s0, sizeof(s0));
 }
Index: projects/clang800-import/usr.sbin/wlandebug/Makefile
===================================================================
--- projects/clang800-import/usr.sbin/wlandebug/Makefile	(revision 344548)
+++ projects/clang800-import/usr.sbin/wlandebug/Makefile	(revision 344549)
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PROG=	wlandebug
 MAN=	wlandebug.8
-MK_PIE:=	no
 
 LIBADD+=	ifconfig
 
 WARNS?=	2
 
 .include <bsd.prog.mk>
Index: projects/clang800-import
===================================================================
--- projects/clang800-import	(revision 344548)
+++ projects/clang800-import	(revision 344549)

Property changes on: projects/clang800-import
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r344513-344548