Index: stable/11/lib/libclang_rt/fuzzer/Makefile
===================================================================
--- stable/11/lib/libclang_rt/fuzzer/Makefile	(revision 365425)
+++ stable/11/lib/libclang_rt/fuzzer/Makefile	(revision 365426)
@@ -1,26 +1,30 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.fuzzer-${CRTARCH}
 
 SRCS+=		fuzzer/FuzzerCrossOver.cpp
 SRCS+=		fuzzer/FuzzerDataFlowTrace.cpp
 SRCS+=		fuzzer/FuzzerDriver.cpp
 SRCS+=		fuzzer/FuzzerExtFunctionsDlsym.cpp
 SRCS+=		fuzzer/FuzzerExtFunctionsWeak.cpp
 SRCS+=		fuzzer/FuzzerExtraCounters.cpp
 SRCS+=		fuzzer/FuzzerFork.cpp
 SRCS+=		fuzzer/FuzzerIO.cpp
 SRCS+=		fuzzer/FuzzerIOPosix.cpp
 SRCS+=		fuzzer/FuzzerLoop.cpp
 SRCS+=		fuzzer/FuzzerMain.cpp
 SRCS+=		fuzzer/FuzzerMerge.cpp
 SRCS+=		fuzzer/FuzzerMutate.cpp
 SRCS+=		fuzzer/FuzzerSHA1.cpp
 SRCS+=		fuzzer/FuzzerTracePC.cpp
 SRCS+=		fuzzer/FuzzerUtil.cpp
 SRCS+=		fuzzer/FuzzerUtilLinux.cpp
 SRCS+=		fuzzer/FuzzerUtilPosix.cpp
 
+.PATH:		${CRTSRC}/include/fuzzer
+INCSDIR=	${CLANGDIR}/include/fuzzer
+INCS+=		FuzzedDataProvider.h
+
 .include <bsd.lib.mk>
Index: stable/11/lib/libclang_rt/profile/Makefile
===================================================================
--- stable/11/lib/libclang_rt/profile/Makefile	(revision 365425)
+++ stable/11/lib/libclang_rt/profile/Makefile	(revision 365426)
@@ -1,28 +1,32 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.profile-${CRTARCH}
 
 CFLAGS+=	-DCOMPILER_RT_HAS_ATOMICS=1
 CFLAGS+=	-DCOMPILER_RT_HAS_FCNTL_LCK=1
 CFLAGS+=	-DCOMPILER_RT_HAS_UNAME=1
 
 # This is needed for --coverage
 CFLAGS+=	-fvisibility=default
 
 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/InstrProfilingNameVar.c
 SRCS+=		profile/InstrProfilingPlatformLinux.c
 SRCS+=		profile/InstrProfilingPlatformOther.c
 SRCS+=		profile/InstrProfilingRuntime.cpp
 SRCS+=		profile/InstrProfilingUtil.c
 SRCS+=		profile/InstrProfilingValue.c
 SRCS+=		profile/InstrProfilingWriter.c
 
+.PATH:		${CRTSRC}/include/profile
+INCSDIR=	${CLANGDIR}/include/profile
+INCS+=		InstrProfData.inc
+
 .include <bsd.lib.mk>
Index: stable/11/lib/libclang_rt/xray/Makefile
===================================================================
--- stable/11/lib/libclang_rt/xray/Makefile	(revision 365425)
+++ stable/11/lib/libclang_rt/xray/Makefile	(revision 365426)
@@ -1,44 +1,50 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.xray-${CRTARCH}
 
 SRCS+=		sanitizer_common/sanitizer_allocator.cpp
 SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
 SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
 SRCS+=		sanitizer_common/sanitizer_flags.cpp
 SRCS+=		sanitizer_common/sanitizer_libc.cpp
 SRCS+=		sanitizer_common/sanitizer_libignore.cpp
 SRCS+=		sanitizer_common/sanitizer_linux.cpp
 SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
 SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
 SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
 SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
 SRCS+=		sanitizer_common/sanitizer_posix.cpp
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
 SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
 SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
 SRCS+=		xray/xray_buffer_queue.cpp
 SRCS+=		xray/xray_flags.cpp
 SRCS+=		xray/xray_init.cpp
 SRCS+=		xray/xray_interface.cpp
 SRCS+=		xray/xray_log_interface.cpp
 SRCS+=		xray/xray_trampoline_x86_64.S
 SRCS+=		xray/xray_utils.cpp
 SRCS+=		xray/xray_x86_64.cpp
 
+.PATH:		${CRTSRC}/include/xray
+INCSDIR=	${CLANGDIR}/include/xray
+INCS+=		xray_interface.h
+INCS+=		xray_log_interface.h
+INCS+=		xray_records.h
+
 .include <bsd.lib.mk>
Index: stable/11
===================================================================
--- stable/11	(revision 365425)
+++ stable/11	(revision 365426)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r364081
Index: stable/12/lib/libclang_rt/fuzzer/Makefile
===================================================================
--- stable/12/lib/libclang_rt/fuzzer/Makefile	(revision 365425)
+++ stable/12/lib/libclang_rt/fuzzer/Makefile	(revision 365426)
@@ -1,26 +1,30 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.fuzzer-${CRTARCH}
 
 SRCS+=		fuzzer/FuzzerCrossOver.cpp
 SRCS+=		fuzzer/FuzzerDataFlowTrace.cpp
 SRCS+=		fuzzer/FuzzerDriver.cpp
 SRCS+=		fuzzer/FuzzerExtFunctionsDlsym.cpp
 SRCS+=		fuzzer/FuzzerExtFunctionsWeak.cpp
 SRCS+=		fuzzer/FuzzerExtraCounters.cpp
 SRCS+=		fuzzer/FuzzerFork.cpp
 SRCS+=		fuzzer/FuzzerIO.cpp
 SRCS+=		fuzzer/FuzzerIOPosix.cpp
 SRCS+=		fuzzer/FuzzerLoop.cpp
 SRCS+=		fuzzer/FuzzerMain.cpp
 SRCS+=		fuzzer/FuzzerMerge.cpp
 SRCS+=		fuzzer/FuzzerMutate.cpp
 SRCS+=		fuzzer/FuzzerSHA1.cpp
 SRCS+=		fuzzer/FuzzerTracePC.cpp
 SRCS+=		fuzzer/FuzzerUtil.cpp
 SRCS+=		fuzzer/FuzzerUtilLinux.cpp
 SRCS+=		fuzzer/FuzzerUtilPosix.cpp
 
+.PATH:		${CRTSRC}/include/fuzzer
+INCSDIR=	${CLANGDIR}/include/fuzzer
+INCS+=		FuzzedDataProvider.h
+
 .include <bsd.lib.mk>
Index: stable/12/lib/libclang_rt/profile/Makefile
===================================================================
--- stable/12/lib/libclang_rt/profile/Makefile	(revision 365425)
+++ stable/12/lib/libclang_rt/profile/Makefile	(revision 365426)
@@ -1,28 +1,32 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.profile-${CRTARCH}
 
 CFLAGS+=	-DCOMPILER_RT_HAS_ATOMICS=1
 CFLAGS+=	-DCOMPILER_RT_HAS_FCNTL_LCK=1
 CFLAGS+=	-DCOMPILER_RT_HAS_UNAME=1
 
 # This is needed for --coverage
 CXXFLAGS+=	-fvisibility=default
 
 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/InstrProfilingNameVar.c
 SRCS+=		profile/InstrProfilingPlatformLinux.c
 SRCS+=		profile/InstrProfilingPlatformOther.c
 SRCS+=		profile/InstrProfilingRuntime.cpp
 SRCS+=		profile/InstrProfilingUtil.c
 SRCS+=		profile/InstrProfilingValue.c
 SRCS+=		profile/InstrProfilingWriter.c
 
+.PATH:		${CRTSRC}/include/profile
+INCSDIR=	${CLANGDIR}/include/profile
+INCS+=		InstrProfData.inc
+
 .include <bsd.lib.mk>
Index: stable/12/lib/libclang_rt/xray/Makefile
===================================================================
--- stable/12/lib/libclang_rt/xray/Makefile	(revision 365425)
+++ stable/12/lib/libclang_rt/xray/Makefile	(revision 365426)
@@ -1,44 +1,50 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
 LIB=		clang_rt.xray-${CRTARCH}
 
 SRCS+=		sanitizer_common/sanitizer_allocator.cpp
 SRCS+=		sanitizer_common/sanitizer_allocator_checks.cpp
 SRCS+=		sanitizer_common/sanitizer_common.cpp
 SRCS+=		sanitizer_common/sanitizer_common_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector1.cpp
 SRCS+=		sanitizer_common/sanitizer_deadlock_detector2.cpp
 SRCS+=		sanitizer_common/sanitizer_errno.cpp
 SRCS+=		sanitizer_common/sanitizer_file.cpp
 SRCS+=		sanitizer_common/sanitizer_flag_parser.cpp
 SRCS+=		sanitizer_common/sanitizer_flags.cpp
 SRCS+=		sanitizer_common/sanitizer_libc.cpp
 SRCS+=		sanitizer_common/sanitizer_libignore.cpp
 SRCS+=		sanitizer_common/sanitizer_linux.cpp
 SRCS+=		sanitizer_common/sanitizer_linux_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_persistent_allocator.cpp
 SRCS+=		sanitizer_common/sanitizer_platform_limits_freebsd.cpp
 SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cpp
 SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cpp
 SRCS+=		sanitizer_common/sanitizer_posix.cpp
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cpp
 SRCS+=		sanitizer_common/sanitizer_printf.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cpp
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cpp
 SRCS+=		sanitizer_common/sanitizer_suppressions.cpp
 SRCS+=		sanitizer_common/sanitizer_termination.cpp
 SRCS+=		sanitizer_common/sanitizer_thread_registry.cpp
 SRCS+=		sanitizer_common/sanitizer_tls_get_addr.cpp
 SRCS+=		sanitizer_common/sanitizer_type_traits.cpp
 SRCS+=		xray/xray_buffer_queue.cpp
 SRCS+=		xray/xray_flags.cpp
 SRCS+=		xray/xray_init.cpp
 SRCS+=		xray/xray_interface.cpp
 SRCS+=		xray/xray_log_interface.cpp
 SRCS+=		xray/xray_trampoline_x86_64.S
 SRCS+=		xray/xray_utils.cpp
 SRCS+=		xray/xray_x86_64.cpp
 
+.PATH:		${CRTSRC}/include/xray
+INCSDIR=	${CLANGDIR}/include/xray
+INCS+=		xray_interface.h
+INCS+=		xray_log_interface.h
+INCS+=		xray_records.h
+
 .include <bsd.lib.mk>
Index: stable/12
===================================================================
--- stable/12	(revision 365425)
+++ stable/12	(revision 365426)

Property changes on: stable/12
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r364081