Module Name: src
Committed By: mrg
Date: Wed Feb 6 04:00:43 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib: Makefile.sanitizer
src/external/gpl3/gcc/lib/libasan: Makefile
src/external/gpl3/gcc/lib/liblsan: Makefile
src/external/gpl3/gcc/lib/libtsan: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
Log Message:
update the sanitizer source lists for gcc 7.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/Makefile.sanitizer
cvs rdiff -u -r1.26 -r1.27 src/external/gpl3/gcc/lib/libasan/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/liblsan/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/lib/libtsan/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/lib/libubsan/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/Makefile.sanitizer
diff -u src/external/gpl3/gcc/lib/Makefile.sanitizer:1.6 src/external/gpl3/gcc/lib/Makefile.sanitizer:1.7
--- src/external/gpl3/gcc/lib/Makefile.sanitizer:1.6 Sun Jul 1 17:41:49 2018
+++ src/external/gpl3/gcc/lib/Makefile.sanitizer Wed Feb 6 04:00:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sanitizer,v 1.6 2018/07/01 17:41:49 christos Exp $
+# $NetBSD: Makefile.sanitizer,v 1.7 2019/02/06 04:00:43 mrg Exp $
SANITIZER=${GCCDIST}/libsanitizer
.PATH: ${SANITIZER}/interception ${SANITIZER}/sanitizer_common
@@ -10,59 +10,55 @@ interception_type_test.cc \
interception_win.cc
SANITIZER_SRCS+= \
-sanitizer_allocator.cc \
-sanitizer_common.cc \
-sanitizer_common_libcdep.cc \
-sanitizer_coverage_libcdep.cc \
-sanitizer_coverage_mapping_libcdep.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_linux_libcdep.cc \
-sanitizer_mac.cc \
-sanitizer_persistent_allocator.cc \
-sanitizer_platform_limits_linux.cc \
-sanitizer_platform_limits_posix.cc \
-sanitizer_posix.cc \
-sanitizer_posix_libcdep.cc \
-sanitizer_printf.cc \
-sanitizer_procmaps_common.cc \
-sanitizer_procmaps_netbsd.cc \
-sanitizer_procmaps_freebsd.cc \
-sanitizer_procmaps_linux.cc \
-sanitizer_procmaps_mac.cc \
-sanitizer_stackdepot.cc \
-sanitizer_stacktrace.cc \
-sanitizer_stacktrace_libcdep.cc \
-sanitizer_stacktrace_printer.cc \
-sanitizer_stoptheworld_linux_libcdep.cc \
-sanitizer_suppressions.cc \
-sanitizer_symbolizer.cc \
-sanitizer_symbolizer_libbacktrace.cc \
-sanitizer_symbolizer_libcdep.cc \
-sanitizer_symbolizer_mac.cc \
-sanitizer_symbolizer_posix_libcdep.cc \
-sanitizer_symbolizer_win.cc \
-sanitizer_thread_registry.cc \
-sanitizer_tls_get_addr.cc \
-sanitizer_unwind_linux_libcdep.cc \
-sanitizer_win.cc
-
-.PATH: ${SANITIZER}/ubsan
-UBSAN_SRCS+= \
-ubsan_diag.cc \
-ubsan_init.cc \
-ubsan_flags.cc \
-ubsan_value.cc
+ sanitizer_allocator.cc \
+ sanitizer_common.cc \
+ sanitizer_common_libcdep.cc \
+ sanitizer_coverage_libcdep.cc \
+ sanitizer_coverage_mapping_libcdep.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_linux_libcdep.cc \
+ sanitizer_linux_s390.cc \
+ sanitizer_mac.cc \
+ sanitizer_persistent_allocator.cc \
+ sanitizer_platform_limits_linux.cc \
+ sanitizer_platform_limits_posix.cc \
+ sanitizer_posix.cc \
+ sanitizer_posix_libcdep.cc \
+ sanitizer_printf.cc \
+ sanitizer_procmaps_common.cc \
+ sanitizer_procmaps_freebsd.cc \
+ sanitizer_procmaps_netbsd.cc \
+ sanitizer_procmaps_linux.cc \
+ sanitizer_procmaps_mac.cc \
+ sanitizer_stackdepot.cc \
+ sanitizer_stacktrace.cc \
+ sanitizer_stacktrace_libcdep.cc \
+ sanitizer_symbolizer_mac.cc \
+ sanitizer_stacktrace_printer.cc \
+ sanitizer_stoptheworld_linux_libcdep.cc \
+ sanitizer_suppressions.cc \
+ sanitizer_symbolizer.cc \
+ sanitizer_symbolizer_libbacktrace.cc \
+ sanitizer_symbolizer_libcdep.cc \
+ sanitizer_symbolizer_posix_libcdep.cc \
+ sanitizer_symbolizer_win.cc \
+ sanitizer_termination.cc \
+ sanitizer_thread_registry.cc \
+ sanitizer_tls_get_addr.cc \
+ sanitizer_unwind_linux_libcdep.cc \
+ sanitizer_win.cc
# The linux build does this to avoid preinit sections on shared libraries
CSHLIBFLAGS+= -DPIC
-SRCS+= ${INTERCEPTION_SRCS} ${SANITIZER_SRCS} ${UBSAN_SRCS}
+#SRCS+= ${INTERCEPTION_SRCS} ${SANITIZER_SRCS} ${UBSAN_SRCS}
+SRCS+= ${INTERCEPTION_SRCS} ${SANITIZER_SRCS}
CPPFLAGS+=-I${SANITIZER}/include -I${SANITIZER}
CPPFLAGS.sanitizer_netbsd.cc+=-I${GCCDIST}/gcc/ginclude
CPPFLAGS+=-D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
Index: src/external/gpl3/gcc/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.26 src/external/gpl3/gcc/lib/libasan/Makefile:1.27
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.26 Sun Jul 1 17:41:49 2018
+++ src/external/gpl3/gcc/lib/libasan/Makefile Wed Feb 6 04:00:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/07/01 17:41:49 christos Exp $
+# $NetBSD: Makefile,v 1.27 2019/02/06 04:00:43 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
NOSANITIZER= # defined
@@ -11,30 +11,33 @@ NOSANITIZER= # defined
.PATH: ${SANITIZER}/asan ${SANITIZER}/lsan
ASAN_SRCS= \
-asan_activation.cc \
-asan_allocator.cc \
-asan_debugging.cc \
-asan_flags.cc \
-asan_fake_stack.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_new_delete.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_win_dll_thunk.cc \
-asan_win_dynamic_runtime_thunk.cc
+ asan_activation.cc \
+ asan_allocator.cc \
+ asan_debugging.cc \
+ asan_descriptions.cc \
+ asan_errors.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_memory_profile.cc \
+ asan_new_delete.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_win_dll_thunk.cc \
+ asan_win_dynamic_runtime_thunk.cc
LIB= asan
SRCS+= ${ASAN_SRCS} lsan_common.cc lsan_common_linux.cc
Index: src/external/gpl3/gcc/lib/liblsan/Makefile
diff -u src/external/gpl3/gcc/lib/liblsan/Makefile:1.3 src/external/gpl3/gcc/lib/liblsan/Makefile:1.4
--- src/external/gpl3/gcc/lib/liblsan/Makefile:1.3 Sun Jul 1 17:41:50 2018
+++ src/external/gpl3/gcc/lib/liblsan/Makefile Wed Feb 6 04:00:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/07/01 17:41:50 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/02/06 04:00:43 mrg Exp $
.include <bsd.own.mk>
@@ -8,13 +8,12 @@
.PATH: ${SANITIZER}/lsan ${SANITIZER}/asan
LSAN_SRCS+= \
-lsan.cc \
-lsan_allocator.cc \
-lsan_common.cc \
-lsan_common_linux.cc \
-lsan_interceptors.cc \
-lsan_preinit.cc \
-lsan_thread.cc
+ lsan_common.cc \
+ lsan_common_linux.cc \
+ lsan.cc \
+ lsan_allocator.cc \
+ lsan_interceptors.cc \
+ lsan_thread.cc
.if ${MACHINE_ARCH} == "vax"
COPTS.lsan_allocator.cc += -O1
Index: src/external/gpl3/gcc/lib/libtsan/Makefile
diff -u src/external/gpl3/gcc/lib/libtsan/Makefile:1.7 src/external/gpl3/gcc/lib/libtsan/Makefile:1.8
--- src/external/gpl3/gcc/lib/libtsan/Makefile:1.7 Sun Feb 4 01:16:33 2018
+++ src/external/gpl3/gcc/lib/libtsan/Makefile Wed Feb 6 04:00:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/02/04 01:16:33 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2019/02/06 04:00:43 mrg Exp $
.include <bsd.own.mk>
@@ -8,39 +8,41 @@
.PATH: ${SANITIZER}/tsan
TSAN_SRCS= \
-tsan_clock.o \
-tsan_fd.o \
-tsan_flags.o \
-tsan_ignoreset.o \
-tsan_interceptors.o \
-tsan_interface.o \
-tsan_interface_ann.o \
-tsan_interface_atomic.o \
-tsan_interface_java.o \
-tsan_libdispatch_mac.o \
-tsan_malloc_mac.o \
-tsan_md5.o \
-tsan_mman.o \
-tsan_mutex.o \
-tsan_mutexset.o \
-tsan_new_delete.o \
-tsan_platform_linux.o \
-tsan_platform_mac.o \
-tsan_platform_posix.o \
-tsan_platform_windows.o \
-tsan_report.o \
-tsan_rtl_amd64.o \
-tsan_rtl.o \
-tsan_rtl_mutex.o \
-tsan_rtl_report.o \
-tsan_rtl_thread.o \
-tsan_stack_trace.o \
-tsan_stat.o \
-tsan_suppressions.o \
-tsan_symbolize.o \
-tsan_sync.o
-
+ tsan_clock.cc \
+ tsan_debugging.cc \
+ tsan_fd.cc \
+ tsan_flags.cc \
+ tsan_ignoreset.cc \
+ tsan_interceptors.cc \
+ tsan_interceptors_mac.cc \
+ tsan_interface_ann.cc \
+ tsan_interface_atomic.cc \
+ tsan_interface.cc \
+ tsan_interface_java.cc \
+ tsan_libdispatch_mac.cc \
+ tsan_malloc_mac.cc \
+ tsan_md5.cc \
+ tsan_mman.cc \
+ tsan_mutex.cc \
+ tsan_mutexset.cc \
+ tsan_new_delete.cc \
+ tsan_platform_linux.cc \
+ tsan_platform_mac.cc \
+ tsan_platform_posix.cc \
+ tsan_platform_windows.cc \
+ tsan_report.cc \
+ tsan_rtl.cc \
+ tsan_rtl_mutex.cc \
+ tsan_rtl_proc.cc \
+ tsan_rtl_report.cc \
+ tsan_rtl_thread.cc \
+ tsan_stack_trace.cc \
+ tsan_stat.cc \
+ tsan_suppressions.cc \
+ tsan_symbolize.cc \
+ tsan_sync.cc
+# XXX ${MACHINE} won't match mips64 or ppc64
.if exists(${SANITIZER}/tsan/tsan_rtl_${MACHINE}.S)
TSAN_SRCS+= tsan_rtl_${MACHINE}.S
.else
Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.9 src/external/gpl3/gcc/lib/libubsan/Makefile:1.10
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.9 Fri Feb 1 10:39:03 2019
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Wed Feb 6 04:00:43 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/02/01 10:39:03 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2019/02/06 04:00:43 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
LIBISCXX = yes
@@ -11,17 +11,16 @@ LIBISCXX = yes
.PATH: ${SANITIZER}/ubsan
UBSAN_SRCS= \
- ubsan_diag.o \
- ubsan_flags.o \
- ubsan_handlers.o \
- ubsan_handlers_cxx.o \
- ubsan_init.o \
- ubsan_init_standalone.o \
- ubsan_type_hash.o \
- ubsan_type_hash_itanium.o \
- ubsan_type_hash_win.o \
- ubsan_value.o
-
+ ubsan_diag.cc \
+ ubsan_flags.cc \
+ ubsan_handlers.cc \
+ ubsan_handlers_cxx.cc \
+ ubsan_init.cc \
+ ubsan_type_hash.cc \
+ ubsan_type_hash_itanium.cc \
+ ubsan_type_hash_win.cc \
+ ubsan_value.cc \
+ ubsan_init_standalone.cc
.for _s in ubsan_handlers_cxx ubsan_type_hash ubsan_type_hash_itanium
COPTS.${_s}.cc+=-frtti
