2 files changed, 115 insertions, 0 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 1180d3343910..7671d67b1b12 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,116 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 2017mmdd: 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
 # 20170103: libbsnmptools.so made into an INTERNALLIB
 OLD_FILES+=usr/lib/libbsnmptools.a
 OLD_FILES+=usr/lib/libbsnmptools_p.a
diff --git a/UPDATING b/UPDATING
index e5586009ff69..d3795efde49f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,6 +51,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+2017mmdd:
+	Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 4.0.0.
+	Please see the 20141231 entry below for information about prerequisites
+	and upgrading, if you are not already using clang 3.5.0 or higher.
+
 20161217:
 	Clang, llvm, lldb, compiler-rt and libc++ have been upgraded to 3.9.1.
 	Please see the 20141231 entry below for information about prerequisites