Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release:

MFC r309142 (by emaste):

Add WITH_LLD_AS_LD build knob

If set it installs LLD as /usr/bin/ld.  LLD (as of version 3.9) is not
capable of linking the world and kernel, but can self-host and link many
substantial applications. GNU ld continues to be used for the world and
kernel build, regardless of how this knob is set.

It is on by default for arm64, and off for all other CPU architectures.

Sponsored by:	The FreeBSD Foundation

MFC r310840:

Reapply 310775, now it also builds correctly if lldb is disabled:

Move llvm-objdump from CLANG_EXTRAS to installed by default

We currently install three tools from binutils 2.17.50: as, ld, and
objdump. Work is underway to migrate to a permissively-licensed
tool-chain, with one goal being the retirement of binutils 2.17.50.

LLVM's llvm-objdump is intended to be compatible with GNU objdump
although it is currently missing some options and may have formatting
differences. Enable it by default for testing and further investigation.
It may later be changed to install as /usr/bin/objdump, it becomes a
fully viable replacement.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D8879

MFC r312855 (by emaste):

Rename LLD_AS_LD to LLD_IS_LD, for consistency with CLANG_IS_CC

Reported by:	Dan McGregor <dan.mcgregor usask.ca>

MFC r313559 | glebius | 2017-02-10 18:34:48 +0100 (Fri, 10 Feb 2017) | 5 lines

Don't check struct rtentry on FreeBSD, it is an internal kernel structure.
On other systems it may be API structure for SIOCADDRT/SIOCDELRT.

Reviewed by:	emaste, dim

MFC r314152 (by jkim):

Remove an assembler flag, which is redundant since r309124.  The upstream
took care of it by introducing a macro NO_EXEC_STACK_DIRECTIVE.

http://llvm.org/viewvc/llvm-project?rev=273500&view=rev

Reviewed by:	dim

MFC r314564:

Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to
4.0.0 (branches/release_40 296509).  The release will follow soon.

Please note that from 3.5.0 onwards, clang, llvm and lldb require C++11
support to build; see UPDATING for more information.

Also note that as of 4.0.0, lld should be able to link the base system
on amd64 and aarch64.  See the WITH_LLD_IS_LLD setting in src.conf(5).
Though please be aware that this is work in progress.

Release notes for llvm, clang and lld will be available here:
<http://releases.llvm.org/4.0.0/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/clang/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/lld/docs/ReleaseNotes.html>

Thanks to Ed Maste, Jan Beich, Antoine Brodin and Eric Fiselier for
their help.

Relnotes:	yes
Exp-run:	antoine
PR:		215969, 216008

MFC r314708:

For now, revert r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

This commit is the cause of excessive compile times on skein_block.c
(and possibly other files) during kernel builds on amd64.

We never saw the problematic behavior described in this upstream commit,
so for now it is better to revert it.  An upstream bug has been filed
here: https://bugs.llvm.org/show_bug.cgi?id=32142

Reported by:	mjg

MFC r314795:

Reapply r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

Pull in r296992 from upstream llvm trunk (by Sanjoy Das):

  [SCEV] Decrease the recursion threshold for CompareValueComplexity

  Fixes PR32142.

  r287232 accidentally increased the recursion threshold for
  CompareValueComplexity from 2 to 32.  This change reverses that
  change by introducing a separate flag for CompareValueComplexity's
  threshold.

The latter revision fixes the excessive compile times for skein_block.c.

MFC r314907 | mmel | 2017-03-08 12:40:27 +0100 (Wed, 08 Mar 2017) | 7 lines

Unbreak ARMv6 world.

The new compiler_rt library imported with clang 4.0.0 have several fatal
issues (non-functional __udivsi3 for example) with ARM specific instrict
functions. As temporary workaround, until upstream solve these problems,
disable all thumb[1][2] related feature.

MFC r315016:

Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release.
We were already very close to the last release candidate, so this is a
pretty minor update.

Relnotes:	yes

MFC r316005:

Revert r314907, and pull in r298713 from upstream compiler-rt trunk (by
Weiming Zhao):

  builtins: Select correct code fragments when compiling for Thumb1/Thum2/ARM ISA.

  Summary:
  Value of __ARM_ARCH_ISA_THUMB isn't based on the actual compilation
  mode (-mthumb, -marm), it reflect's capability of given CPU.

  Due to this:
   - use  __tbumb__ and __thumb2__ insteand of __ARM_ARCH_ISA_THUMB
   - use '.thumb' directive consistently  in all affected files
   - decorate all thumb functions using
     DEFINE_COMPILERRT_THUMB_FUNCTION()

  ---------
  Note: This patch doesn't fix broken Thumb1 variant of __udivsi3 !

  Reviewers: weimingz, rengolin, compnerd

  Subscribers: aemerson, dim

  Differential Revision: https://reviews.llvm.org/D30938

Discussed with:	mmel

3 files changed, 139 insertions, 111 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 5c495f5..62ae77c 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1355,115 +1355,117 @@ 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.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_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_DIRS+=usr/lib/clang
 OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
 OLD_DIRS+=usr/share/doc/llvm/clang
@@ -1485,19 +1487,23 @@ OLD_FILES+=usr/bin/llvm-ar
 OLD_FILES+=usr/bin/llvm-as
 OLD_FILES+=usr/bin/llvm-bcanalyzer
 OLD_FILES+=usr/bin/llvm-cxxdump
+OLD_FILES+=usr/bin/llvm-cxxfilt
 OLD_FILES+=usr/bin/llvm-diff
 OLD_FILES+=usr/bin/llvm-dis
 OLD_FILES+=usr/bin/llvm-dwarfdump
 OLD_FILES+=usr/bin/llvm-extract
 OLD_FILES+=usr/bin/llvm-link
 OLD_FILES+=usr/bin/llvm-lto
+OLD_FILES+=usr/bin/llvm-lto2
 OLD_FILES+=usr/bin/llvm-mc
+OLD_FILES+=usr/bin/llvm-modextract
 OLD_FILES+=usr/bin/llvm-nm
 OLD_FILES+=usr/bin/llvm-objdump
 OLD_FILES+=usr/bin/llvm-pdbdump
 OLD_FILES+=usr/bin/llvm-ranlib
 OLD_FILES+=usr/bin/llvm-rtdyld
 OLD_FILES+=usr/bin/llvm-symbolizer
+OLD_FILES+=usr/bin/llvm-xray
 OLD_FILES+=usr/bin/opt
 OLD_FILES+=usr/share/man/man1/bugpoint.1.gz
 OLD_FILES+=usr/share/man/man1/llc.1.gz
@@ -4399,6 +4405,7 @@ OLD_FILES+=usr/include/c++/v1/__functional_03
 OLD_FILES+=usr/include/c++/v1/__functional_base
 OLD_FILES+=usr/include/c++/v1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/__hash_table
+OLD_FILES+=usr/include/c++/v1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/__locale
 OLD_FILES+=usr/include/c++/v1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/__nullptr
@@ -4406,12 +4413,13 @@ OLD_FILES+=usr/include/c++/v1/__refstring
 OLD_FILES+=usr/include/c++/v1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/__std_stream
+OLD_FILES+=usr/include/c++/v1/__string
 OLD_FILES+=usr/include/c++/v1/__threading_support
 OLD_FILES+=usr/include/c++/v1/__tree
 OLD_FILES+=usr/include/c++/v1/__tuple
-OLD_FILES+=usr/include/c++/v1/__undef___deallocate
 OLD_FILES+=usr/include/c++/v1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/algorithm
+OLD_FILES+=usr/include/c++/v1/any
 OLD_FILES+=usr/include/c++/v1/array
 OLD_FILES+=usr/include/c++/v1/atomic
 OLD_FILES+=usr/include/c++/v1/bitset
@@ -4494,14 +4502,18 @@ OLD_FILES+=usr/include/c++/v1/iostream
 OLD_FILES+=usr/include/c++/v1/istream
 OLD_FILES+=usr/include/c++/v1/iterator
 OLD_FILES+=usr/include/c++/v1/limits
+OLD_FILES+=usr/include/c++/v1/limits.h
 OLD_FILES+=usr/include/c++/v1/list
 OLD_FILES+=usr/include/c++/v1/locale
+OLD_FILES+=usr/include/c++/v1/locale.h
 OLD_FILES+=usr/include/c++/v1/map
 OLD_FILES+=usr/include/c++/v1/math.h
 OLD_FILES+=usr/include/c++/v1/memory
 OLD_FILES+=usr/include/c++/v1/mutex
 OLD_FILES+=usr/include/c++/v1/new
 OLD_FILES+=usr/include/c++/v1/numeric
+OLD_FILES+=usr/include/c++/v1/numeric
+OLD_FILES+=usr/include/c++/v1/optional
 OLD_FILES+=usr/include/c++/v1/ostream
 OLD_FILES+=usr/include/c++/v1/queue
 OLD_FILES+=usr/include/c++/v1/random
@@ -4516,11 +4528,13 @@ OLD_FILES+=usr/include/c++/v1/stack
 OLD_FILES+=usr/include/c++/v1/stdbool.h
 OLD_FILES+=usr/include/c++/v1/stddef.h
 OLD_FILES+=usr/include/c++/v1/stdexcept
+OLD_FILES+=usr/include/c++/v1/stdint.h
 OLD_FILES+=usr/include/c++/v1/stdio.h
 OLD_FILES+=usr/include/c++/v1/stdlib.h
 OLD_FILES+=usr/include/c++/v1/streambuf
 OLD_FILES+=usr/include/c++/v1/string
 OLD_FILES+=usr/include/c++/v1/string.h
+OLD_FILES+=usr/include/c++/v1/string_view
 OLD_FILES+=usr/include/c++/v1/strstream
 OLD_FILES+=usr/include/c++/v1/system_error
 OLD_FILES+=usr/include/c++/v1/tgmath.h
@@ -4534,6 +4548,7 @@ OLD_FILES+=usr/include/c++/v1/tr1/__functional_03
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base
 OLD_FILES+=usr/include/c++/v1/tr1/__functional_base_03
 OLD_FILES+=usr/include/c++/v1/tr1/__hash_table
+OLD_FILES+=usr/include/c++/v1/tr1/__libcpp_version
 OLD_FILES+=usr/include/c++/v1/tr1/__locale
 OLD_FILES+=usr/include/c++/v1/tr1/__mutex_base
 OLD_FILES+=usr/include/c++/v1/tr1/__nullptr
@@ -4541,12 +4556,13 @@ OLD_FILES+=usr/include/c++/v1/tr1/__refstring
 OLD_FILES+=usr/include/c++/v1/tr1/__split_buffer
 OLD_FILES+=usr/include/c++/v1/tr1/__sso_allocator
 OLD_FILES+=usr/include/c++/v1/tr1/__std_stream
+OLD_FILES+=usr/include/c++/v1/tr1/__string
 OLD_FILES+=usr/include/c++/v1/tr1/__threading_support
 OLD_FILES+=usr/include/c++/v1/tr1/__tree
 OLD_FILES+=usr/include/c++/v1/tr1/__tuple
-OLD_FILES+=usr/include/c++/v1/tr1/__undef___deallocate
 OLD_FILES+=usr/include/c++/v1/tr1/__undef_min_max
 OLD_FILES+=usr/include/c++/v1/tr1/algorithm
+OLD_FILES+=usr/include/c++/v1/tr1/any
 OLD_FILES+=usr/include/c++/v1/tr1/array
 OLD_FILES+=usr/include/c++/v1/tr1/atomic
 OLD_FILES+=usr/include/c++/v1/tr1/bitset
@@ -4597,14 +4613,18 @@ OLD_FILES+=usr/include/c++/v1/tr1/iostream
 OLD_FILES+=usr/include/c++/v1/tr1/istream
 OLD_FILES+=usr/include/c++/v1/tr1/iterator
 OLD_FILES+=usr/include/c++/v1/tr1/limits
+OLD_FILES+=usr/include/c++/v1/tr1/limits.h
 OLD_FILES+=usr/include/c++/v1/tr1/list
 OLD_FILES+=usr/include/c++/v1/tr1/locale
+OLD_FILES+=usr/include/c++/v1/tr1/locale.h
 OLD_FILES+=usr/include/c++/v1/tr1/map
 OLD_FILES+=usr/include/c++/v1/tr1/math.h
 OLD_FILES+=usr/include/c++/v1/tr1/memory
 OLD_FILES+=usr/include/c++/v1/tr1/mutex
 OLD_FILES+=usr/include/c++/v1/tr1/new
 OLD_FILES+=usr/include/c++/v1/tr1/numeric
+OLD_FILES+=usr/include/c++/v1/tr1/numeric
+OLD_FILES+=usr/include/c++/v1/tr1/optional
 OLD_FILES+=usr/include/c++/v1/tr1/ostream
 OLD_FILES+=usr/include/c++/v1/tr1/queue
 OLD_FILES+=usr/include/c++/v1/tr1/random
@@ -4619,11 +4639,13 @@ OLD_FILES+=usr/include/c++/v1/tr1/stack
 OLD_FILES+=usr/include/c++/v1/tr1/stdbool.h
 OLD_FILES+=usr/include/c++/v1/tr1/stddef.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdexcept
+OLD_FILES+=usr/include/c++/v1/tr1/stdint.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdio.h
 OLD_FILES+=usr/include/c++/v1/tr1/stdlib.h
 OLD_FILES+=usr/include/c++/v1/tr1/streambuf
 OLD_FILES+=usr/include/c++/v1/tr1/string
 OLD_FILES+=usr/include/c++/v1/tr1/string.h
+OLD_FILES+=usr/include/c++/v1/tr1/string_view
 OLD_FILES+=usr/include/c++/v1/tr1/strstream
 OLD_FILES+=usr/include/c++/v1/tr1/system_error
 OLD_FILES+=usr/include/c++/v1/tr1/tgmath.h
@@ -4636,6 +4658,7 @@ OLD_FILES+=usr/include/c++/v1/tr1/unordered_map
 OLD_FILES+=usr/include/c++/v1/tr1/unordered_set
 OLD_FILES+=usr/include/c++/v1/tr1/utility
 OLD_FILES+=usr/include/c++/v1/tr1/valarray
+OLD_FILES+=usr/include/c++/v1/tr1/variant
 OLD_FILES+=usr/include/c++/v1/tr1/vector
 OLD_FILES+=usr/include/c++/v1/tr1/wchar.h
 OLD_FILES+=usr/include/c++/v1/tr1/wctype.h
@@ -4650,6 +4673,7 @@ OLD_FILES+=usr/include/c++/v1/unwind-itanium.h
 OLD_FILES+=usr/include/c++/v1/unwind.h
 OLD_FILES+=usr/include/c++/v1/utility
 OLD_FILES+=usr/include/c++/v1/valarray
+OLD_FILES+=usr/include/c++/v1/variant
 OLD_FILES+=usr/include/c++/v1/vector
 OLD_FILES+=usr/include/c++/v1/wchar.h
 OLD_FILES+=usr/include/c++/v1/wctype.h
diff --git a/tools/build/options/WITHOUT_LLD_IS_LD b/tools/build/options/WITHOUT_LLD_IS_LD
new file mode 100644
index 0000000..0d48f20
--- /dev/null
+++ b/tools/build/options/WITHOUT_LLD_IS_LD
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to use GNU binutils ld as the system linker, instead of LLVM's LLD.
diff --git a/tools/build/options/WITH_LLD_IS_LD b/tools/build/options/WITH_LLD_IS_LD
new file mode 100644
index 0000000..a291b09
--- /dev/null
+++ b/tools/build/options/WITH_LLD_IS_LD
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to use LLVM's LLD as the system linker, instead of GNU binutils ld.