Update compiler-rt to 3.7.0 release. This also includes the sanitizer

and profile libraries.

9 files changed, 54 insertions, 29 deletions

diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile
index b082e38..18ad0d4 100644
--- a/lib/libclang_rt/Makefile
+++ b/lib/libclang_rt/Makefile
@@ -4,10 +4,11 @@
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 SUBDIR+= asan\
+	 asan-preinit\
 	 asan_cxx\
-	 san\
-	 ubsan\
-	 ubsan_cxx
+	 safestack\
+	 ubsan_standalone\
+	 ubsan_standalone_cxx
 .endif
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || \
diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc
index d9f0dca..ef381c9 100644
--- a/lib/libclang_rt/Makefile.inc
+++ b/lib/libclang_rt/Makefile.inc
@@ -18,6 +18,9 @@ CFLAGS+=${PICFLAG}
 CFLAGS+=-fno-builtin
 CFLAGS+=-fno-exceptions
 CFLAGS+=-fno-rtti
+.if ${COMPILER_VERSION} >= 30700
+CFLAGS+=-fno-sanitize=safe-stack
+.endif
 CFLAGS+=-fno-stack-protector
 CFLAGS+=-funwind-tables
 CFLAGS+=-fvisibility-inlines-hidden
diff --git a/lib/libclang_rt/asan-preinit/Makefile b/lib/libclang_rt/asan-preinit/Makefile
new file mode 100644
index 0000000..c15f84b
--- /dev/null
+++ b/lib/libclang_rt/asan-preinit/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+LIB=	clang_rt.asan-preinit-${CRTARCH}
+
+.PATH:	${CRTSRC}/lib/asan
+
+SRCS=	asan_preinit.cc
+
+.include <bsd.lib.mk>
diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index e751970..3090c93 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -7,7 +7,8 @@ LIB=	clang_rt.asan-${CRTARCH}
 .PATH:	${CRTSRC}/lib/asan\
 	${CRTSRC}/lib/interception\
 	${CRTSRC}/lib/sanitizer_common\
-	${CRTSRC}/lib/lsan
+	${CRTSRC}/lib/lsan\
+	${CRTSRC}/lib/ubsan
 
 SRCS=	asan_preinit.cc\
 	asan_allocator.cc\
@@ -60,6 +61,7 @@ SRCS=	asan_preinit.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\
@@ -73,8 +75,14 @@ SRCS=	asan_preinit.cc\
 	sanitizer_stoptheworld_linux_libcdep.cc\
 	sanitizer_symbolizer_libcdep.cc\
 	sanitizer_symbolizer_posix_libcdep.cc\
-	sanitizer_unwind_posix_libcdep.cc\
+	sanitizer_symbolizer_process_libcdep.cc\
+	sanitizer_unwind_linux_libcdep.cc\
 	lsan_common.cc\
-	lsan_common_linux.cc
+	lsan_common_linux.cc\
+	ubsan_diag.cc\
+	ubsan_init.cc\
+	ubsan_flags.cc\
+	ubsan_handlers.cc\
+	ubsan_value.cc
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/asan_cxx/Makefile b/lib/libclang_rt/asan_cxx/Makefile
index 9763c16..20ee25e 100644
--- a/lib/libclang_rt/asan_cxx/Makefile
+++ b/lib/libclang_rt/asan_cxx/Makefile
@@ -4,8 +4,15 @@
 
 LIB=	clang_rt.asan_cxx-${CRTARCH}
 
-.PATH:	${CRTSRC}/lib/asan
+CXXFLAGS+=-frtti
 
-SRCS=	asan_new_delete.cc
+.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
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/profile/Makefile b/lib/libclang_rt/profile/Makefile
index 058a8f1..6acbb4e 100644
--- a/lib/libclang_rt/profile/Makefile
+++ b/lib/libclang_rt/profile/Makefile
@@ -13,5 +13,6 @@ SRCS=	GCDAProfiling.c\
 	InstrProfilingPlatformDarwin.c\
 	InstrProfilingPlatformOther.c\
 	InstrProfilingRuntime.cc\
+	InstrProfilingUtil.c
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/ubsan/Makefile b/lib/libclang_rt/ubsan/Makefile
deleted file mode 100644
index 34bca81..0000000
--- a/lib/libclang_rt/ubsan/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.init.mk>
-
-LIB=	clang_rt.ubsan-${CRTARCH}
-
-.PATH:	${CRTSRC}/lib/ubsan
-
-SRCS=	ubsan_diag.cc\
-	ubsan_init.cc\
-	ubsan_flags.cc\
-	ubsan_handlers.cc\
-	ubsan_value.cc
-
-.include <bsd.lib.mk>
-
-
diff --git a/lib/libclang_rt/san/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index da8fe13..3ba5ca0 100644
--- a/lib/libclang_rt/san/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -2,9 +2,10 @@
 
 .include <bsd.init.mk>
 
-LIB=	clang_rt.san-${CRTARCH}
+LIB=	clang_rt.ubsan_standalone-${CRTARCH}
 
 .PATH:	${CRTSRC}/lib/sanitizer_common\
+	${CRTSRC}/lib/ubsan
 
 SRCS=	sanitizer_allocator.cc\
 	sanitizer_common.cc\
@@ -31,6 +32,7 @@ SRCS=	sanitizer_allocator.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\
@@ -44,6 +46,13 @@ SRCS=	sanitizer_allocator.cc\
 	sanitizer_stoptheworld_linux_libcdep.cc\
 	sanitizer_symbolizer_libcdep.cc\
 	sanitizer_symbolizer_posix_libcdep.cc\
-	sanitizer_unwind_posix_libcdep.cc
+	sanitizer_symbolizer_process_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
 
 .include <bsd.lib.mk>
diff --git a/lib/libclang_rt/ubsan_cxx/Makefile b/lib/libclang_rt/ubsan_standalone_cxx/Makefile
index e577a15..f893d7d 100644
--- a/lib/libclang_rt/ubsan_cxx/Makefile
+++ b/lib/libclang_rt/ubsan_standalone_cxx/Makefile
@@ -2,13 +2,15 @@
 
 .include <bsd.init.mk>
 
-LIB=	clang_rt.ubsan_cxx-${CRTARCH}
+LIB=	clang_rt.ubsan_standalone_cxx-${CRTARCH}
 
 CXXFLAGS+=-frtti
 
 .PATH:	${CRTSRC}/lib/ubsan
 
 SRCS=	ubsan_handlers_cxx.cc\
-	ubsan_type_hash.cc
+	ubsan_type_hash.cc\
+	ubsan_type_hash_itanium.cc\
+	ubsan_type_hash_win.cc
 
 .include <bsd.lib.mk>