1 files changed, 40 insertions, 41 deletions
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>