diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 8f7678043a92..efd466721ce5 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,142 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 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
diff --git a/UPDATING b/UPDATING
index d8162360cd57..3bbd351287e0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -32,6 +32,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
 
+20180630:
+	Clang, llvm, lld, lldb, compiler-rt and libc++ have been upgraded to
+	6.0.1.  Please see the 20141231 entry below for information about
+	prerequisites and upgrading, if you are not already using clang 3.5.0
+	or higher.
+
 20180612:
 	r334930 changed the interface between the NFS modules, so they all
 	need to be rebuilt.  r335018 did a __FreeBSD_version bump for this.
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index c053fcf2a274..e95c77d2c534 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -29,7 +29,7 @@
             ..
             lib
                 clang
-                    6.0.0
+                    6.0.1
                         lib
                             freebsd
                             ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 3e76838a5ada..3212e81ed843 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -25,7 +25,7 @@
         aout
         ..
         clang
-            6.0.0
+            6.0.1
                 include
                     sanitizer
                     ..
diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile
index afcc59de66f5..a353b05a473a 100644
--- a/lib/clang/headers/Makefile
+++ b/lib/clang/headers/Makefile
@@ -4,7 +4,7 @@
 
 .PATH:		${CLANG_SRCS}/lib/Headers
 
-INCSDIR=	${LIBDIR}/clang/6.0.0/include
+INCSDIR=	${LIBDIR}/clang/6.0.1/include
 
 GENINCS+=	arm_neon.h
 
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index 501ad1b0c4b3..a2dc5478bf56 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -14,7 +14,7 @@ CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
 .PATH:		${CRTSRC}/lib
 
-CLANGDIR=	/usr/lib/clang/6.0.0
+CLANGDIR=	/usr/lib/clang/6.0.1
 LIBDIR=		${CLANGDIR}/lib/freebsd
 
 NO_PIC=
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 83e3114c356e..c2bda9be7fcb 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1314,145 +1314,141 @@ OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-tblgen
-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.dd-i386.a
-OLD_FILES+=usr/lib/clang/6.0.0/lib/freebsd/libclang_rt.dd-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-i386.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-i386.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
+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
 OLD_DIRS+=usr/lib/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang