diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index dff00ae453a1..8d6a94be9580 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,88 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# yyyymmdd: new clang import which bumps version from 3.7.1 to 3.8.0.
+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-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
 # 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
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 4a499ea2ab4d..bcb960f34d8d 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -27,7 +27,7 @@
             ..
             lib
                 clang
-                    3.7.1
+                    3.8.0
                         lib
                             freebsd
                             ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 1a5835b52729..d15eea5e27b9 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -19,7 +19,7 @@
         aout
         ..
         clang
-            3.7.1
+            3.8.0
                 include
                     sanitizer
                     ..
diff --git a/lib/clang/include/Makefile b/lib/clang/include/Makefile
index 2b20cbb1443c..4fd15d168fba 100644
--- a/lib/clang/include/Makefile
+++ b/lib/clang/include/Makefile
@@ -8,9 +8,10 @@ LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm
 
 .PATH: ${LLVM_SRCS}/tools/clang/lib/Headers
 
-INCSDIR=${LIBDIR}/clang/3.7.1/include
+INCSDIR=${LIBDIR}/clang/3.8.0/include
 
-INCS=	__stddef_max_align_t.h \
+INCS=	__clang_cuda_runtime_wrapper.h \
+	__stddef_max_align_t.h \
 	__wmmintrin_aes.h \
 	__wmmintrin_pclmul.h \
 	adxintrin.h \
@@ -62,6 +63,10 @@ INCS=	__stddef_max_align_t.h \
 	x86intrin.h \
 	xmmintrin.h \
 	xopintrin.h \
+	xsavecintrin.h \
+	xsaveintrin.h \
+	xsaveoptintrin.h \
+	xsavesintrin.h \
 	xtestintrin.h \
 	${GENINCS}
 GENINCS= arm_neon.h
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index 1e656d98c8c9..cd1e79142ee5 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -5,7 +5,7 @@
 CRTARCH=${MACHINE_CPUARCH:C/amd64/x86_64/}
 CRTSRC=${.CURDIR}/../../../contrib/compiler-rt
 
-CLANGDIR=/usr/lib/clang/3.7.1
+CLANGDIR=/usr/lib/clang/3.8.0
 LIBDIR=${CLANGDIR}/lib/freebsd
 
 NO_PIC=
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index cb51987e1a6c..d55050644bd6 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1053,87 +1053,87 @@ OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 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-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
+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/__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/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/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-x86_64.a
+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
 OLD_DIRS+=usr/lib/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang