MFC r309124:

Upgrade our copies of clang, llvm, lldb, compiler-rt and libc++ to 3.9.0
release, and add lld 3.9.0.  Also completely revamp the build system for
clang, llvm, lldb and their related tools.

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

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

Thanks to Ed Maste, Bryan Drewery, Andrew Turner, Antoine Brodin and Jan
Beich for their help.

Relnotes:	yes

MFC r309147:

Pull in r282174 from upstream llvm trunk (by Krzysztof Parzyszek):

  [PPC] Set SP after loading data from stack frame, if no red zone is
  present

  Follow-up to r280705: Make sure that the SP is only restored after
  all data is loaded from the stack frame, if there is no red zone.

  This completes the fix for
  https://llvm.org/bugs/show_bug.cgi?id=26519.

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

Reported by:    Mark Millard
PR:             214433

MFC r309149:

Pull in r283060 from upstream llvm trunk (by Hal Finkel):

  [PowerPC] Refactor soft-float support, and enable PPC64 soft float

  This change enables soft-float for PowerPC64, and also makes
  soft-float disable all vector instruction sets for both 32-bit and
  64-bit modes. This latter part is necessary because the PPC backend
  canonicalizes many Altivec vector types to floating-point types, and
  so soft-float breaks scalarization support for many operations. Both
  for embedded targets and for operating-system kernels desiring
  soft-float support, it seems reasonable that disabling hardware
  floating-point also disables vector instructions (embedded targets
  without hardware floating point support are unlikely to have Altivec,
  etc. and operating system kernels desiring not to use floating-point
  registers to lower syscall cost are unlikely to want to use vector
  registers either). If someone needs this to work, we'll need to
  change the fact that we promote many Altivec operations to act on
  v4f32. To make it possible to disable Altivec when soft-float is
  enabled, hardware floating-point support needs to be expressed as a
  positive feature, like the others, and not a negative feature,
  because target features cannot have dependencies on the disabling of
  some other feature. So +soft-float has now become -hard-float.

  Fixes PR26970.

Pull in r283061 from upstream clang trunk (by Hal Finkel):

  [PowerPC] Enable soft-float for PPC64, and +soft-float -> -hard-float

  Enable soft-float support on PPC64, as the backend now supports it.
  Also, the backend now uses -hard-float instead of +soft-float, so set
  the target features accordingly.

  Fixes PR26970.

Reported by:	Mark Millard
PR:		214433

MFC r309212:

Add a few missed clang 3.9.0 files to OptionalObsoleteFiles.

MFC r309262:

Fix packaging for clang, lldb and lld 3.9.0

During the upgrade of clang/llvm etc to 3.9.0 in r309124, the PACKAGE
directive in the usr.bin/clang/*.mk files got dropped accidentally.

Restore it, with a few minor changes and additions:
* Correct license in clang.ucl to NCSA
* Add PACKAGE=clang for clang and most of the "ll" tools
* Put lldb in its own package
* Put lld in its own package

Reviewed by:	gjb, jmallett
Differential Revision: https://reviews.freebsd.org/D8666

MFC r309656:

During the bootstrap phase, when building the minimal llvm library on
PowerPC, add lib/Support/Atomic.cpp.  This is needed because upstream
llvm revision r271821 disabled the use of std::call_once, which causes
some fallback functions from Atomic.cpp to be used instead.

Reported by:	Mark Millard
PR:		214902

MFC r309835:

Tentatively apply https://reviews.llvm.org/D18730 to work around gcc PR
70528 (bogus error: constructor required before non-static data member).
This should fix buildworld with the external gcc package.

Reported by:	https://jenkins.freebsd.org/job/FreeBSD_HEAD_amd64_gcc/

MFC r310194:

Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to
3.9.1 release.

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

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

Relnotes:	yes

13 files changed, 380 insertions, 328 deletions

diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile
index 8322db1..a7216bb 100644
--- a/lib/libclang_rt/Makefile
+++ b/lib/libclang_rt/Makefile
@@ -3,19 +3,21 @@
 .include <src.opts.mk>
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-SUBDIR+= include\
-	 asan\
-	 asan-preinit\
-	 asan_dynamic\
-	 asan_cxx\
-	 safestack\
-	 ubsan_standalone\
-	 ubsan_standalone_cxx
+SUBDIR+=	include
+SUBDIR+=	asan
+SUBDIR+=	asan-preinit
+SUBDIR+=	asan_dynamic
+SUBDIR+=	asan_cxx
+SUBDIR+=	safestack
+SUBDIR+=	stats
+SUBDIR+=	stats_client
+SUBDIR+=	ubsan_standalone
+SUBDIR+=	ubsan_standalone_cxx
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
     (${MACHINE_CPUARCH} == "arm" && ${MACHINE_ARCH} != "armeb")
-SUBDIR+= profile
+SUBDIR+=	profile
 .endif
 
 .include <bsd.subdir.mk>
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index cd1e791..47cd21b 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -2,29 +2,31 @@
 
 .include <src.opts.mk>
 
-CRTARCH=${MACHINE_CPUARCH:C/amd64/x86_64/}
-CRTSRC=${.CURDIR}/../../../contrib/compiler-rt
+CRTARCH=	${MACHINE_CPUARCH:C/amd64/x86_64/}
+CRTSRC=		${SRCTOP}/contrib/compiler-rt
 
-CLANGDIR=/usr/lib/clang/3.8.0
-LIBDIR=${CLANGDIR}/lib/freebsd
+.PATH:		${CRTSRC}/lib
+
+CLANGDIR=	/usr/lib/clang/3.9.1
+LIBDIR=		${CLANGDIR}/lib/freebsd
 
 NO_PIC=
-MK_PROFILE=no
+MK_PROFILE=	no
 
-WARNS?=0
+WARNS?=		0
 
 SSP_CFLAGS=
-CFLAGS+=-DNDEBUG
-CFLAGS+=${PICFLAG}
-CFLAGS+=-fno-builtin
-CFLAGS+=-fno-exceptions
-CFLAGS+=-fno-rtti
+CFLAGS+=	-DNDEBUG
+CFLAGS+=	${PICFLAG}
+CFLAGS+=	-fno-builtin
+CFLAGS+=	-fno-exceptions
+CFLAGS+=	-fno-rtti
 .if ${COMPILER_VERSION} >= 30700
-CFLAGS+=-fno-sanitize=safe-stack
+CFLAGS+=	-fno-sanitize=safe-stack
 .endif
-CFLAGS+=-fno-stack-protector
-CFLAGS+=-funwind-tables
-CFLAGS+=-fvisibility-inlines-hidden
-CFLAGS+=-fvisibility=hidden
-CFLAGS+=-I${CRTSRC}/lib
-CXXFLAGS+=-std=c++11
+CFLAGS+=	-fno-stack-protector
+CFLAGS+=	-funwind-tables
+CFLAGS+=	-fvisibility-inlines-hidden
+CFLAGS+=	-fvisibility=hidden
+CFLAGS+=	-I${CRTSRC}/lib
+CXXFLAGS+=	-std=c++11
diff --git a/lib/libclang_rt/asan-preinit/Makefile b/lib/libclang_rt/asan-preinit/Makefile
index c15f84b..7b9baeb 100644
--- a/lib/libclang_rt/asan-preinit/Makefile
+++ b/lib/libclang_rt/asan-preinit/Makefile
@@ -2,10 +2,8 @@
 
 .include <bsd.init.mk>
 
-LIB=	clang_rt.asan-preinit-${CRTARCH}
+LIB=		clang_rt.asan-preinit-${CRTARCH}
 
-.PATH:	${CRTSRC}/lib/asan
-
-SRCS=	asan_preinit.cc
+SRCS+=		asan/asan_preinit.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index c8097f8..41578e4 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -2,86 +2,83 @@
 
 .include <bsd.init.mk>
 
-LIB=	clang_rt.asan-${CRTARCH}
+LIB=		clang_rt.asan-${CRTARCH}
 
-.PATH:	${CRTSRC}/lib/asan\
-	${CRTSRC}/lib/interception\
-	${CRTSRC}/lib/sanitizer_common\
-	${CRTSRC}/lib/lsan\
-	${CRTSRC}/lib/ubsan
-
-SRCS=	asan_preinit.cc\
-	asan_allocator.cc\
-	asan_activation.cc\
-	asan_debugging.cc\
-	asan_fake_stack.cc\
-	asan_flags.cc\
-	asan_globals.cc\
-	asan_interceptors.cc\
-	asan_linux.cc\
-	asan_mac.cc\
-	asan_malloc_linux.cc\
-	asan_malloc_mac.cc\
-	asan_malloc_win.cc\
-	asan_poisoning.cc\
-	asan_posix.cc\
-	asan_report.cc\
-	asan_rtl.cc\
-	asan_stack.cc\
-	asan_stats.cc\
-	asan_suppressions.cc\
-	asan_thread.cc\
-	asan_win.cc\
-	interception_linux.cc\
-	interception_mac.cc\
-	interception_win.cc\
-	interception_type_test.cc\
-	sanitizer_allocator.cc\
-	sanitizer_common.cc\
-	sanitizer_deadlock_detector1.cc\
-	sanitizer_deadlock_detector2.cc\
-	sanitizer_flags.cc\
-	sanitizer_flag_parser.cc\
-	sanitizer_libc.cc\
-	sanitizer_libignore.cc\
-	sanitizer_linux.cc\
-	sanitizer_mac.cc\
-	sanitizer_persistent_allocator.cc\
-	sanitizer_platform_limits_linux.cc\
-	sanitizer_platform_limits_posix.cc\
-	sanitizer_posix.cc\
-	sanitizer_printf.cc\
-	sanitizer_procmaps_common.cc\
-	sanitizer_procmaps_freebsd.cc\
-	sanitizer_procmaps_linux.cc\
-	sanitizer_procmaps_mac.cc\
-	sanitizer_stackdepot.cc\
-	sanitizer_stacktrace.cc\
-	sanitizer_stacktrace_printer.cc\
-	sanitizer_suppressions.cc\
-	sanitizer_symbolizer.cc\
-	sanitizer_symbolizer_libbacktrace.cc\
-	sanitizer_symbolizer_mac.cc\
-	sanitizer_symbolizer_win.cc\
-	sanitizer_tls_get_addr.cc\
-	sanitizer_thread_registry.cc\
-	sanitizer_win.cc\
-	sanitizer_common_libcdep.cc\
-	sanitizer_coverage_libcdep.cc\
-	sanitizer_coverage_mapping_libcdep.cc\
-	sanitizer_linux_libcdep.cc\
-	sanitizer_posix_libcdep.cc\
-	sanitizer_stacktrace_libcdep.cc\
-	sanitizer_stoptheworld_linux_libcdep.cc\
-	sanitizer_symbolizer_libcdep.cc\
-	sanitizer_symbolizer_posix_libcdep.cc\
-	sanitizer_unwind_linux_libcdep.cc\
-	lsan_common.cc\
-	lsan_common_linux.cc\
-	ubsan_diag.cc\
-	ubsan_init.cc\
-	ubsan_flags.cc\
-	ubsan_handlers.cc\
-	ubsan_value.cc
+SRCS+=		asan/asan_activation.cc
+SRCS+=		asan/asan_allocator.cc
+SRCS+=		asan/asan_debugging.cc
+SRCS+=		asan/asan_fake_stack.cc
+SRCS+=		asan/asan_flags.cc
+SRCS+=		asan/asan_globals.cc
+SRCS+=		asan/asan_interceptors.cc
+SRCS+=		asan/asan_linux.cc
+SRCS+=		asan/asan_mac.cc
+SRCS+=		asan/asan_malloc_linux.cc
+SRCS+=		asan/asan_malloc_mac.cc
+SRCS+=		asan/asan_malloc_win.cc
+SRCS+=		asan/asan_memory_profile.cc
+SRCS+=		asan/asan_poisoning.cc
+SRCS+=		asan/asan_posix.cc
+SRCS+=		asan/asan_preinit.cc
+SRCS+=		asan/asan_report.cc
+SRCS+=		asan/asan_rtl.cc
+SRCS+=		asan/asan_stack.cc
+SRCS+=		asan/asan_stats.cc
+SRCS+=		asan/asan_suppressions.cc
+SRCS+=		asan/asan_thread.cc
+SRCS+=		asan/asan_win.cc
+SRCS+=		interception/interception_linux.cc
+SRCS+=		interception/interception_mac.cc
+SRCS+=		interception/interception_type_test.cc
+SRCS+=		interception/interception_win.cc
+SRCS+=		lsan/lsan_common.cc
+SRCS+=		lsan/lsan_common_linux.cc
+SRCS+=		sanitizer_common/sanitizer_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_common.cc
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cc
+SRCS+=		sanitizer_common/sanitizer_flags.cc
+SRCS+=		sanitizer_common/sanitizer_libc.cc
+SRCS+=		sanitizer_common/sanitizer_libignore.cc
+SRCS+=		sanitizer_common/sanitizer_linux.cc
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
+SRCS+=		sanitizer_common/sanitizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_mac.cc
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cc
+SRCS+=		sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_suppressions.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_win.cc
+SRCS+=		sanitizer_common/sanitizer_termination.cc
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_win.cc
+SRCS+=		ubsan/ubsan_diag.cc
+SRCS+=		ubsan/ubsan_flags.cc
+SRCS+=		ubsan/ubsan_handlers.cc
+SRCS+=		ubsan/ubsan_init.cc
+SRCS+=		ubsan/ubsan_value.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/asan_cxx/Makefile b/lib/libclang_rt/asan_cxx/Makefile
index 20ee25e..36dab06 100644
--- a/lib/libclang_rt/asan_cxx/Makefile
+++ b/lib/libclang_rt/asan_cxx/Makefile
@@ -2,17 +2,14 @@
 
 .include <bsd.init.mk>
 
-LIB=	clang_rt.asan_cxx-${CRTARCH}
+LIB=		clang_rt.asan_cxx-${CRTARCH}
 
-CXXFLAGS+=-frtti
+CXXFLAGS+=	-frtti
 
-.PATH:	${CRTSRC}/lib/asan\
-	${CRTSRC}/lib/ubsan
-
-SRCS=	asan_new_delete.cc\
-	ubsan_handlers_cxx.cc\
-	ubsan_type_hash.cc\
-	ubsan_type_hash_itanium.cc\
-	ubsan_type_hash_win.cc
+SRCS+=		asan/asan_new_delete.cc
+SRCS+=		ubsan/ubsan_handlers_cxx.cc
+SRCS+=		ubsan/ubsan_type_hash.cc
+SRCS+=		ubsan/ubsan_type_hash_itanium.cc
+SRCS+=		ubsan/ubsan_type_hash_win.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index 8bd44e7..bc47881 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -5,89 +5,86 @@
 SHLIB_NAME=	libclang_rt.asan-${CRTARCH}.so
 .undef NO_PIC # sorry...
 
-.PATH:	${CRTSRC}/lib/asan\
-	${CRTSRC}/lib/interception\
-	${CRTSRC}/lib/sanitizer_common\
-	${CRTSRC}/lib/lsan\
-	${CRTSRC}/lib/ubsan
-
-SRCS=	interception_linux.cc\
-	interception_mac.cc\
-	interception_win.cc\
-	interception_type_test.cc\
-	sanitizer_allocator.cc\
-	sanitizer_common.cc\
-	sanitizer_deadlock_detector1.cc\
-	sanitizer_deadlock_detector2.cc\
-	sanitizer_flags.cc\
-	sanitizer_flag_parser.cc\
-	sanitizer_libc.cc\
-	sanitizer_libignore.cc\
-	sanitizer_linux.cc\
-	sanitizer_mac.cc\
-	sanitizer_persistent_allocator.cc\
-	sanitizer_platform_limits_linux.cc\
-	sanitizer_platform_limits_posix.cc\
-	sanitizer_posix.cc\
-	sanitizer_printf.cc\
-	sanitizer_procmaps_common.cc\
-	sanitizer_procmaps_freebsd.cc\
-	sanitizer_procmaps_linux.cc\
-	sanitizer_procmaps_mac.cc\
-	sanitizer_stackdepot.cc\
-	sanitizer_stacktrace.cc\
-	sanitizer_stacktrace_printer.cc\
-	sanitizer_suppressions.cc\
-	sanitizer_symbolizer.cc\
-	sanitizer_symbolizer_libbacktrace.cc\
-	sanitizer_symbolizer_mac.cc\
-	sanitizer_symbolizer_win.cc\
-	sanitizer_tls_get_addr.cc\
-	sanitizer_thread_registry.cc\
-	sanitizer_win.cc\
-	sanitizer_common_libcdep.cc\
-	sanitizer_coverage_libcdep.cc\
-	sanitizer_coverage_mapping_libcdep.cc\
-	sanitizer_linux_libcdep.cc\
-	sanitizer_posix_libcdep.cc\
-	sanitizer_stacktrace_libcdep.cc\
-	sanitizer_stoptheworld_linux_libcdep.cc\
-	sanitizer_symbolizer_libcdep.cc\
-	sanitizer_symbolizer_posix_libcdep.cc\
-	sanitizer_unwind_linux_libcdep.cc\
-	lsan_common.cc\
-	lsan_common_linux.cc\
-	ubsan_diag.cc\
-	ubsan_init.cc\
-	ubsan_flags.cc\
-	ubsan_handlers.cc\
-	ubsan_value.cc\
-	asan_allocator.cc\
-	asan_activation.cc\
-	asan_debugging.cc\
-	asan_fake_stack.cc\
-	asan_flags.cc\
-	asan_globals.cc\
-	asan_interceptors.cc\
-	asan_linux.cc\
-	asan_mac.cc\
-	asan_malloc_linux.cc\
-	asan_malloc_mac.cc\
-	asan_malloc_win.cc\
-	asan_poisoning.cc\
-	asan_posix.cc\
-	asan_report.cc\
-	asan_rtl.cc\
-	asan_stack.cc\
-	asan_stats.cc\
-	asan_suppressions.cc\
-	asan_thread.cc\
-	asan_win.cc\
-	asan_new_delete.cc\
-	ubsan_handlers_cxx.cc\
-	ubsan_type_hash.cc\
-	ubsan_type_hash_itanium.cc\
-	ubsan_type_hash_win.cc
+SRCS+=		asan/asan_activation.cc
+SRCS+=		asan/asan_allocator.cc
+SRCS+=		asan/asan_debugging.cc
+SRCS+=		asan/asan_fake_stack.cc
+SRCS+=		asan/asan_flags.cc
+SRCS+=		asan/asan_globals.cc
+SRCS+=		asan/asan_interceptors.cc
+SRCS+=		asan/asan_linux.cc
+SRCS+=		asan/asan_mac.cc
+SRCS+=		asan/asan_malloc_linux.cc
+SRCS+=		asan/asan_malloc_mac.cc
+SRCS+=		asan/asan_malloc_win.cc
+SRCS+=		asan/asan_memory_profile.cc
+SRCS+=		asan/asan_new_delete.cc
+SRCS+=		asan/asan_poisoning.cc
+SRCS+=		asan/asan_posix.cc
+SRCS+=		asan/asan_report.cc
+SRCS+=		asan/asan_rtl.cc
+SRCS+=		asan/asan_stack.cc
+SRCS+=		asan/asan_stats.cc
+SRCS+=		asan/asan_suppressions.cc
+SRCS+=		asan/asan_thread.cc
+SRCS+=		asan/asan_win.cc
+SRCS+=		interception/interception_linux.cc
+SRCS+=		interception/interception_mac.cc
+SRCS+=		interception/interception_type_test.cc
+SRCS+=		interception/interception_win.cc
+SRCS+=		lsan/lsan_common.cc
+SRCS+=		lsan/lsan_common_linux.cc
+SRCS+=		sanitizer_common/sanitizer_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_common.cc
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cc
+SRCS+=		sanitizer_common/sanitizer_flags.cc
+SRCS+=		sanitizer_common/sanitizer_libc.cc
+SRCS+=		sanitizer_common/sanitizer_libignore.cc
+SRCS+=		sanitizer_common/sanitizer_linux.cc
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
+SRCS+=		sanitizer_common/sanitizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_mac.cc
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cc
+SRCS+=		sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_suppressions.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_win.cc
+SRCS+=		sanitizer_common/sanitizer_termination.cc
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_win.cc
+SRCS+=		ubsan/ubsan_diag.cc
+SRCS+=		ubsan/ubsan_flags.cc
+SRCS+=		ubsan/ubsan_handlers.cc
+SRCS+=		ubsan/ubsan_handlers_cxx.cc
+SRCS+=		ubsan/ubsan_init.cc
+SRCS+=		ubsan/ubsan_type_hash.cc
+SRCS+=		ubsan/ubsan_type_hash_itanium.cc
+SRCS+=		ubsan/ubsan_type_hash_win.cc
+SRCS+=		ubsan/ubsan_value.cc
 
 # Kludge around a bsd.lib.mk shortcoming: when SHLIB_NAME is defined, but LIB
 # and LIB_CXX are undefined (which forces building only a shared library),
diff --git a/lib/libclang_rt/include/Makefile b/lib/libclang_rt/include/Makefile
index 5638d4f..412063a 100644
--- a/lib/libclang_rt/include/Makefile
+++ b/lib/libclang_rt/include/Makefile
@@ -2,18 +2,19 @@
 
 .include <bsd.init.mk>
 
-.PATH: ${CRTSRC}/include/sanitizer
+.PATH:		${CRTSRC}/include/sanitizer
 
-INCSDIR=${CLANGDIR}/include/sanitizer
+INCSDIR=	${CLANGDIR}/include/sanitizer
 
-INCS=	allocator_interface.h\
-	asan_interface.h\
-	common_interface_defs.h\
-	coverage_interface.h\
-	dfsan_interface.h\
-	linux_syscall_hooks.h\
-	lsan_interface.h\
-	msan_interface.h\
-	tsan_interface_atomic.h
+INCS+=		allocator_interface.h
+INCS+=		asan_interface.h
+INCS+=		common_interface_defs.h
+INCS+=		coverage_interface.h
+INCS+=		dfsan_interface.h
+INCS+=		esan_interface.h
+INCS+=		linux_syscall_hooks.h
+INCS+=		lsan_interface.h
+INCS+=		msan_interface.h
+INCS+=		tsan_interface_atomic.h
 
 .include <bsd.prog.mk>
diff --git a/lib/libclang_rt/profile/Makefile b/lib/libclang_rt/profile/Makefile
index 68ba991..e9110cf 100644
--- a/lib/libclang_rt/profile/Makefile
+++ b/lib/libclang_rt/profile/Makefile
@@ -2,20 +2,20 @@
 
 .include <bsd.init.mk>
 
-LIB=	clang_rt.profile-${CRTARCH}
+LIB=		clang_rt.profile-${CRTARCH}
 
-.PATH:	${CRTSRC}/lib/profile
-
-SRCS=	GCDAProfiling.c\
-	InstrProfiling.c\
-	InstrProfilingValue.c\
-	InstrProfilingBuffer.c\
-	InstrProfilingFile.c\
-	InstrProfilingWriter.c\
-	InstrProfilingPlatformDarwin.c\
-	InstrProfilingPlatformLinux.c\
-	InstrProfilingPlatformOther.c\
-	InstrProfilingRuntime.cc\
-	InstrProfilingUtil.c
+SRCS+=		profile/GCDAProfiling.c
+SRCS+=		profile/InstrProfiling.c
+SRCS+=		profile/InstrProfilingBuffer.c
+SRCS+=		profile/InstrProfilingFile.c
+SRCS+=		profile/InstrProfilingMerge.c
+SRCS+=		profile/InstrProfilingMergeFile.c
+SRCS+=		profile/InstrProfilingPlatformDarwin.c
+SRCS+=		profile/InstrProfilingPlatformLinux.c
+SRCS+=		profile/InstrProfilingPlatformOther.c
+SRCS+=		profile/InstrProfilingRuntime.cc
+SRCS+=		profile/InstrProfilingUtil.c
+SRCS+=		profile/InstrProfilingValue.c
+SRCS+=		profile/InstrProfilingWriter.c
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index f769412..050b05c 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -2,47 +2,46 @@
 
 .include <bsd.init.mk>
 
-LIB=	clang_rt.safestack-${CRTARCH}
+LIB=		clang_rt.safestack-${CRTARCH}
 
-.PATH:	${CRTSRC}/lib/interception\
-	${CRTSRC}/lib/sanitizer_common\
-	${CRTSRC}/lib/safestack
-
-SRCS=	interception_linux.cc\
-	interception_mac.cc\
-	interception_win.cc\
-	interception_type_test.cc\
-	sanitizer_allocator.cc\
-	sanitizer_common.cc\
-	sanitizer_deadlock_detector1.cc\
-	sanitizer_deadlock_detector2.cc\
-	sanitizer_flags.cc\
-	sanitizer_flag_parser.cc\
-	sanitizer_libc.cc\
-	sanitizer_libignore.cc\
-	sanitizer_linux.cc\
-	sanitizer_mac.cc\
-	sanitizer_persistent_allocator.cc\
-	sanitizer_platform_limits_linux.cc\
-	sanitizer_platform_limits_posix.cc\
-	sanitizer_posix.cc\
-	sanitizer_printf.cc\
-	sanitizer_procmaps_common.cc\
-	sanitizer_procmaps_freebsd.cc\
-	sanitizer_procmaps_linux.cc\
-	sanitizer_procmaps_mac.cc\
-	sanitizer_stackdepot.cc\
-	sanitizer_stacktrace.cc\
-	sanitizer_stacktrace_printer.cc\
-	sanitizer_suppressions.cc\
-	sanitizer_symbolizer.cc\
-	sanitizer_symbolizer_libbacktrace.cc\
-	sanitizer_symbolizer_mac.cc\
-	sanitizer_symbolizer_win.cc\
-	sanitizer_tls_get_addr.cc\
-	sanitizer_thread_registry.cc\
-	sanitizer_win.cc\
-	sanitizer_common_nolibc.cc\
-	safestack.cc
+SRCS+=		interception/interception_linux.cc
+SRCS+=		interception/interception_mac.cc
+SRCS+=		interception/interception_type_test.cc
+SRCS+=		interception/interception_win.cc
+SRCS+=		safestack/safestack.cc
+SRCS+=		sanitizer_common/sanitizer_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_common.cc
+SRCS+=		sanitizer_common/sanitizer_common_nolibc.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cc
+SRCS+=		sanitizer_common/sanitizer_flags.cc
+SRCS+=		sanitizer_common/sanitizer_libc.cc
+SRCS+=		sanitizer_common/sanitizer_libignore.cc
+SRCS+=		sanitizer_common/sanitizer_linux.cc
+SRCS+=		sanitizer_common/sanitizer_linux_s390.cc
+SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
+SRCS+=		sanitizer_common/sanitizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix.cc
+SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_mac.cc
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cc
+SRCS+=		sanitizer_common/sanitizer_suppressions.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_win.cc
+SRCS+=		sanitizer_common/sanitizer_termination.cc
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
+SRCS+=		sanitizer_common/sanitizer_win.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile
new file mode 100644
index 0000000..7516ec4
--- /dev/null
+++ b/lib/libclang_rt/stats/Makefile
@@ -0,0 +1,52 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+LIB=		clang_rt.stats-${CRTARCH}
+
+SRCS+=		sanitizer_common/sanitizer_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_common.cc
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cc
+SRCS+=		sanitizer_common/sanitizer_flags.cc
+SRCS+=		sanitizer_common/sanitizer_libc.cc
+SRCS+=		sanitizer_common/sanitizer_libignore.cc
+SRCS+=		sanitizer_common/sanitizer_linux.cc
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_linux_s390.cc
+SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
+SRCS+=		sanitizer_common/sanitizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_mac.cc
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cc
+SRCS+=		sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_suppressions.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_win.cc
+SRCS+=		sanitizer_common/sanitizer_termination.cc
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_win.cc
+SRCS+=		stats/stats.cc
+
+.include <bsd.lib.mk>
diff --git a/lib/libclang_rt/stats_client/Makefile b/lib/libclang_rt/stats_client/Makefile
new file mode 100644
index 0000000..e15b5cd
--- /dev/null
+++ b/lib/libclang_rt/stats_client/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+LIB=		clang_rt.stats_client-${CRTARCH}
+
+SRCS+=		stats/stats_client.cc
+
+.include <bsd.lib.mk>
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index fddd2ed..c7c65fd 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -2,56 +2,56 @@
 
 .include <bsd.init.mk>
 
-LIB=	clang_rt.ubsan_standalone-${CRTARCH}
+LIB=		clang_rt.ubsan_standalone-${CRTARCH}
 
-.PATH:	${CRTSRC}/lib/sanitizer_common\
-	${CRTSRC}/lib/ubsan
-
-SRCS=	sanitizer_allocator.cc\
-	sanitizer_common.cc\
-	sanitizer_deadlock_detector1.cc\
-	sanitizer_deadlock_detector2.cc\
-	sanitizer_flags.cc\
-	sanitizer_flag_parser.cc\
-	sanitizer_libc.cc\
-	sanitizer_libignore.cc\
-	sanitizer_linux.cc\
-	sanitizer_mac.cc\
-	sanitizer_persistent_allocator.cc\
-	sanitizer_platform_limits_linux.cc\
-	sanitizer_platform_limits_posix.cc\
-	sanitizer_posix.cc\
-	sanitizer_printf.cc\
-	sanitizer_procmaps_common.cc\
-	sanitizer_procmaps_freebsd.cc\
-	sanitizer_procmaps_linux.cc\
-	sanitizer_procmaps_mac.cc\
-	sanitizer_stackdepot.cc\
-	sanitizer_stacktrace.cc\
-	sanitizer_stacktrace_printer.cc\
-	sanitizer_suppressions.cc\
-	sanitizer_symbolizer.cc\
-	sanitizer_symbolizer_libbacktrace.cc\
-	sanitizer_symbolizer_mac.cc\
-	sanitizer_symbolizer_win.cc\
-	sanitizer_tls_get_addr.cc\
-	sanitizer_thread_registry.cc\
-	sanitizer_win.cc\
-	sanitizer_common_libcdep.cc\
-	sanitizer_coverage_libcdep.cc\
-	sanitizer_coverage_mapping_libcdep.cc\
-	sanitizer_linux_libcdep.cc\
-	sanitizer_posix_libcdep.cc\
-	sanitizer_stacktrace_libcdep.cc\
-	sanitizer_stoptheworld_linux_libcdep.cc\
-	sanitizer_symbolizer_libcdep.cc\
-	sanitizer_symbolizer_posix_libcdep.cc\
-	sanitizer_unwind_linux_libcdep.cc\
-	ubsan_diag.cc\
-	ubsan_init.cc\
-	ubsan_flags.cc\
-	ubsan_handlers.cc\
-	ubsan_value.cc\
-	ubsan_init_standalone.cc
+SRCS+=		sanitizer_common/sanitizer_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_common.cc
+SRCS+=		sanitizer_common/sanitizer_common_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_coverage_mapping_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cc
+SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cc
+SRCS+=		sanitizer_common/sanitizer_flag_parser.cc
+SRCS+=		sanitizer_common/sanitizer_flags.cc
+SRCS+=		sanitizer_common/sanitizer_libc.cc
+SRCS+=		sanitizer_common/sanitizer_libignore.cc
+SRCS+=		sanitizer_common/sanitizer_linux.cc
+SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_linux_s390.cc
+SRCS+=		sanitizer_common/sanitizer_linux_x86_64.S
+SRCS+=		sanitizer_common/sanitizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
+SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix.cc
+SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_linux.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_mac.cc
+SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cc
+SRCS+=		sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_suppressions.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libbacktrace.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_mac.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_symbolizer_win.cc
+SRCS+=		sanitizer_common/sanitizer_termination.cc
+SRCS+=		sanitizer_common/sanitizer_thread_registry.cc
+SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cc
+SRCS+=		sanitizer_common/sanitizer_unwind_linux_libcdep.cc
+SRCS+=		sanitizer_common/sanitizer_win.cc
+SRCS+=		ubsan/ubsan_diag.cc
+SRCS+=		ubsan/ubsan_flags.cc
+SRCS+=		ubsan/ubsan_handlers.cc
+SRCS+=		ubsan/ubsan_init.cc
+SRCS+=		ubsan/ubsan_init_standalone.cc
+SRCS+=		ubsan/ubsan_value.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/ubsan_standalone_cxx/Makefile b/lib/libclang_rt/ubsan_standalone_cxx/Makefile
index f893d7d..7d811de 100644
--- a/lib/libclang_rt/ubsan_standalone_cxx/Makefile
+++ b/lib/libclang_rt/ubsan_standalone_cxx/Makefile
@@ -2,15 +2,13 @@
 
 .include <bsd.init.mk>
 
-LIB=	clang_rt.ubsan_standalone_cxx-${CRTARCH}
+LIB=		clang_rt.ubsan_standalone_cxx-${CRTARCH}
 
-CXXFLAGS+=-frtti
+CXXFLAGS+=	-frtti
 
-.PATH:	${CRTSRC}/lib/ubsan
-
-SRCS=	ubsan_handlers_cxx.cc\
-	ubsan_type_hash.cc\
-	ubsan_type_hash_itanium.cc\
-	ubsan_type_hash_win.cc
+SRCS+=		ubsan/ubsan_handlers_cxx.cc
+SRCS+=		ubsan/ubsan_type_hash.cc
+SRCS+=		ubsan/ubsan_type_hash_itanium.cc
+SRCS+=		ubsan/ubsan_type_hash_win.cc
 
 .include <bsd.lib.mk>