From 0fda9a31a2b07968033d748b1f0c40ea869affd3 Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Tue, 31 May 2016 20:47:52 +0000
Subject: [PATCH] Update sources and flags (compiles but missing stuff)

---
 external/gpl3/gcc/lib/libasan/Makefile      | 96 ++++++++++++++-------
 external/gpl3/gcc/lib/libasan/shlib_version |  2 +-
 2 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/external/gpl3/gcc/lib/libasan/Makefile b/external/gpl3/gcc/lib/libasan/Makefile
index 0b06ca23dbfd..5fb0b69dd0db 100644
--- a/external/gpl3/gcc/lib/libasan/Makefile
+++ b/external/gpl3/gcc/lib/libasan/Makefile
@@ -7,40 +7,74 @@ ASAN=${GCCDIST}/libsanitizer
 .PATH: ${ASAN}/asan ${ASAN}/interception ${ASAN}/sanitizer_common
 
 ASAN_SRCS= \
-	asan_allocator2.cc \
-	asan_interceptors.cc \
-	asan_posix.cc \
-	asan_new_delete.cc \
-	asan_rtl.cc \
-	asan_stats.cc \
-	asan_globals.cc \
-	asan_fake_stack.cc \
-	asan_linux.cc \
-	asan_report.cc \
-	asan_malloc_linux.cc \
-	asan_poisoning.cc \
-	asan_stack.cc \
-	asan_thread.cc \
-	asan_preinit.cc
+asan_activation.cc \
+asan_allocator2.cc \
+asan_debugging.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_thread.cc \
+asan_win.cc \
+asan_win_dll_thunk.cc \
+asan_win_dynamic_runtime_thunk.cc
 
 INTERCEPTION_SRCS= \
-	interception_linux.cc \
-	interception_type_test.cc
+interception_linux.cc \
+interception_mac.cc \
+interception_type_test.cc \
+interception_win.cc
 
 SANITIZER_SRCS= \
-	sanitizer_allocator.cc \
-	sanitizer_common.cc \
-	sanitizer_flags.cc \
-	sanitizer_libc.cc \
-	sanitizer_netbsd.cc \
-	sanitizer_mac.cc \
-	sanitizer_posix.cc \
-	sanitizer_platform_limits_posix.cc \
-	sanitizer_printf.cc \
-	sanitizer_stackdepot.cc \
-	sanitizer_stacktrace.cc \
-	sanitizer_symbolizer.cc \
-	sanitizer_win.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_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_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_posix_libcdep.cc \
+sanitizer_symbolizer_win.cc \
+sanitizer_thread_registry.cc \
+sanitizer_tls_get_addr.cc \
+sanitizer_unwind_posix_libcdep.cc \
+sanitizer_win.cc
 
 # The linux build does this to avoid preinit sections on shared libraries
 CSHLIBFLAGS+= -DPIC
@@ -49,9 +83,11 @@ LIB=	asan
 SRCS=	${ASAN_SRCS} ${INTERCEPTION_SRCS} ${SANITIZER_SRCS}
 CPPFLAGS+=-I${ASAN}/include -I${ASAN}
 CPPFLAGS.sanitizer_netbsd.cc+=-I${GCCDIST}/gcc/ginclude
+CPPFLAGS+=-D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DASAN_HAS_EXCEPTIONS=1 -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=0 -DASAN_NEEDS_SEGV=1
 
 LIBDPLIBS+=    stdc++ ${.CURDIR}/../libstdc++-v3
 LIBDPLIBS+=    pthread ${.CURDIR}/../../../../../lib/libpthread
+COPTS+=-std=gnu++11 -fsized-deallocation -fvisibility=hidden
 
 .if ${MACHINE_ARCH} == "vax"
 COPTS.asan_allocator2.cc += -O1
diff --git a/external/gpl3/gcc/lib/libasan/shlib_version b/external/gpl3/gcc/lib/libasan/shlib_version
index 97c9f92d6b8f..1edea46de912 100644
--- a/external/gpl3/gcc/lib/libasan/shlib_version
+++ b/external/gpl3/gcc/lib/libasan/shlib_version
@@ -1,2 +1,2 @@
-major=0
+major=1
 minor=0