Module Name: src
Committed By: mrg
Date: Sun Feb 4 01:16:33 UTC 2018
Modified Files:
src/external/gpl3/gcc/lib: Makefile.sanitizer
src/external/gpl3/gcc/lib/libasan: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libtsan: Makefile
src/external/gpl3/gcc/lib/libubsan: Makefile
Log Message:
updates for GCC 6.4.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/Makefile.sanitizer
cvs rdiff -u -r1.18 -r1.19 src/external/gpl3/gcc/lib/libasan/Makefile
cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/libtsan/Makefile
cvs rdiff -u -r1.3 -r1.4 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.2 src/external/gpl3/gcc/lib/Makefile.sanitizer:1.3
--- src/external/gpl3/gcc/lib/Makefile.sanitizer:1.2 Thu Jun 9 07:11:08 2016
+++ src/external/gpl3/gcc/lib/Makefile.sanitizer Sun Feb 4 01:16:32 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sanitizer,v 1.2 2016/06/09 07:11:08 mrg Exp $
+# $NetBSD: Makefile.sanitizer,v 1.3 2018/02/04 01:16:32 mrg Exp $
SANITIZER=${GCCDIST}/libsanitizer
.PATH: ${SANITIZER}/interception ${SANITIZER}/sanitizer_common
@@ -18,6 +18,7 @@ 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 \
@@ -43,11 +44,12 @@ 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_posix_libcdep.cc \
+sanitizer_unwind_linux_libcdep.cc \
sanitizer_win.cc
# The linux build does this to avoid preinit sections on shared libraries
@@ -58,7 +60,8 @@ CPPFLAGS+=-I${SANITIZER}/include -I${SAN
CPPFLAGS.sanitizer_netbsd.cc+=-I${GCCDIST}/gcc/ginclude
CPPFLAGS+=-D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
CPPFLAGS+=-D__STDC_LIMIT_MACROS -DSANITIZER_HAS_EXCEPTIONS=1
-CPPFLAGS+=-DSANITIZER_FLEXIBLE_MAPPING_AND_OFFSET=0 -DSANITIZER_NEEDS_SEGV=1
+CPPFLAGS+=-DSANITIZER_NEEDS_SEGV=1
+#CPPFLAGS+=-DCAN_SANITIZE_UB=0
LIBDPLIBS+= stdc++ ${.CURDIR}/../libstdc++-v3
LIBDPLIBS+= pthread ${.CURDIR}/../../../../../lib/libpthread
Index: src/external/gpl3/gcc/lib/libasan/Makefile
diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.18 src/external/gpl3/gcc/lib/libasan/Makefile:1.19
--- src/external/gpl3/gcc/lib/libasan/Makefile:1.18 Thu Jun 29 18:52:23 2017
+++ src/external/gpl3/gcc/lib/libasan/Makefile Sun Feb 4 01:16:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2017/06/29 18:52:23 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2018/02/04 01:16:33 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
@@ -11,8 +11,9 @@ UNSUPPORTED_COMPILER.clang= # defined
ASAN_SRCS= \
asan_activation.cc \
-asan_allocator2.cc \
+asan_allocator.cc \
asan_debugging.cc \
+asan_flags.cc \
asan_fake_stack.cc \
asan_globals.cc \
asan_interceptors.cc \
@@ -28,6 +29,7 @@ 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 \
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.30 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.31
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.30 Sat Feb 3 21:27:45 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Sun Feb 4 01:16:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: Makefile,v 1.31 2018/02/04 01:16:33 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -170,7 +170,8 @@ COPTS.ext-inst.cc+= -Wno-error
.for f in collate_members_cow \
messages_members_cow \
monetary_members_cow \
- numeric_members_cow
+ numeric_members_cow \
+ c++locale
COPTS.${f}.cc+= -fimplicit-templates ${G_GLIBCXX_ABI_FLAGS}
.endfor
Index: src/external/gpl3/gcc/lib/libtsan/Makefile
diff -u src/external/gpl3/gcc/lib/libtsan/Makefile:1.6 src/external/gpl3/gcc/lib/libtsan/Makefile:1.7
--- src/external/gpl3/gcc/lib/libtsan/Makefile:1.6 Tue Jan 9 01:51:20 2018
+++ src/external/gpl3/gcc/lib/libtsan/Makefile Sun Feb 4 01:16:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/01/09 01:51:20 christos Exp $
+# $NetBSD: Makefile,v 1.7 2018/02/04 01:16:33 mrg Exp $
.include <bsd.own.mk>
@@ -17,12 +17,16 @@ 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 \
@@ -36,6 +40,7 @@ tsan_suppressions.o \
tsan_symbolize.o \
tsan_sync.o
+
.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.3 src/external/gpl3/gcc/lib/libubsan/Makefile:1.4
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.3 Thu Jun 29 18:52:23 2017
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Sun Feb 4 01:16:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/06/29 18:52:23 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/04 01:16:33 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
@@ -15,10 +15,16 @@ UBSAN_SRCS= \
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
-COPTS.ubsan_type_hash.cc+=-frtti
+
+.for _s in ubsan_handlers_cxx ubsan_type_hash ubsan_type_hash_itanium
+COPTS.${_s}.cc+=-frtti
+.endfor
LIB= ubsan
SRCS+= ${UBSAN_SRCS}
