3 files changed, 117 insertions, 83 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 7e8ee36f6d23..46fe2a0269f9 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1164,88 +1164,115 @@ OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/llvm-tblgen
-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/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/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_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
 OLD_DIRS+=usr/lib/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang
@@ -1279,7 +1306,6 @@ OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-pdbdump
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-symbolizer
-OLD_FILES+=usr/bin/macho-dump
 OLD_FILES+=usr/bin/opt
 OLD_FILES+=usr/share/man/man1/bugpoint.1.gz
 OLD_FILES+=usr/share/man/man1/llc.1.gz
@@ -4397,6 +4423,10 @@ OLD_DIRS+=usr/include/c++/v1
 # to be filled in
 #.endif
 
+.if ${MK_LLD} == no
+OLD_FILES+=usr/bin/ld.lld
+.endif
+
 .if ${MK_LLDB} == no
 OLD_FILES+=usr/bin/lldb
 OLD_FILES+=usr/share/man/man1/lldb.1.gz
diff --git a/tools/build/options/WITHOUT_LLD b/tools/build/options/WITHOUT_LLD
new file mode 100644
index 000000000000..78bb7de9e228
--- /dev/null
+++ b/tools/build/options/WITHOUT_LLD
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build LLVM's lld linker.
diff --git a/tools/build/options/WITH_LLD b/tools/build/options/WITH_LLD
new file mode 100644
index 000000000000..e6aef39d5feb
--- /dev/null
+++ b/tools/build/options/WITH_LLD
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build LLVM's lld linker.