[src/trunk]: src/external/gpl3/gcc/dist don't undef SDB_DEBUGGING_INFO. obso...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/11b69d846b52
branches:  trunk
changeset: 454921:11b69d846b52
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Oct 02 05:04:58 2019 +0000

description:
don't undef SDB_DEBUGGING_INFO.  obsolete (and triggers a warning.)
disable isInDeadlySignal() for now.
fix some compile errors in asan and lsan.

diffstat:

 external/gpl3/gcc/dist/gcc/config/alpha/elf.h                                                |   2 -
 external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h                                        |   2 +-
 external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc                                   |   3 +-
 external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc |  15 ++++-----
 4 files changed, 9 insertions(+), 13 deletions(-)

diffs (76 lines):

diff -r 166ead8706ff -r 11b69d846b52 external/gpl3/gcc/dist/gcc/config/alpha/elf.h
--- a/external/gpl3/gcc/dist/gcc/config/alpha/elf.h     Wed Oct 02 04:23:58 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/alpha/elf.h     Wed Oct 02 05:04:58 2019 +0000
@@ -22,8 +22,6 @@
 #undef EXTENDED_COFF
 #define OBJECT_FORMAT_ELF
 
-/* ??? Move all SDB stuff from alpha.h to osf.h.  */
-#undef SDB_DEBUGGING_INFO
 #undef DBX_DEBUGGING_INFO
 
 #define DWARF2_DEBUGGING_INFO 1
diff -r 166ead8706ff -r 11b69d846b52 external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h
--- a/external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h     Wed Oct 02 04:23:58 2019 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h     Wed Oct 02 05:04:58 2019 +0000
@@ -42,7 +42,7 @@
       // On FreeBSD the slow unwinding that leverages _Unwind_Backtrace()
       // yields the call stack of the signal's handler and not of the code
       // that raised the signal (as it does on Linux).
-      if ((SANITIZER_NETBSD || SANITIZER_FREEBSD) && t->isInDeadlySignal()) fast = true;
+      //if ((SANITIZER_NETBSD || SANITIZER_FREEBSD) && t->isInDeadlySignal()) fast = true;
       uptr stack_top = t->stack_top();
       uptr stack_bottom = t->stack_bottom();
       ScopedUnwinding unwind_scope(t);
diff -r 166ead8706ff -r 11b69d846b52 external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc
--- a/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc        Wed Oct 02 04:23:58 2019 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc        Wed Oct 02 05:04:58 2019 +0000
@@ -28,8 +28,7 @@
 static const uptr kMaxAllowedMallocSize = 1UL << 30;
 #elif defined(__mips64) || defined(__aarch64__)
 static const uptr kMaxAllowedMallocSize = 4UL << 30;
-#else
-#if _LP64
+#elif _LP64
 static const uptr kMaxAllowedMallocSize = 8UL << 30;
 #else
 static const uptr kMaxAllowedMallocSize = 8UL << 20;
diff -r 166ead8706ff -r 11b69d846b52 external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
--- a/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc      Wed Oct 02 04:23:58 2019 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc      Wed Oct 02 05:04:58 2019 +0000
@@ -26,7 +26,6 @@
 #include <errno.h>
 #include <sched.h> // for CLONE_* definitions
 #include <stddef.h>
-#include <signal.h>
 #if SANITIZER_LINUX
 #include <sys/prctl.h> // for PR_* definitions
 #endif
@@ -38,7 +37,13 @@
 // GLIBC 2.20+ sys/user does not include asm/ptrace.h
 # include <asm/ptrace.h>
 #endif
-#if SANITIZER_NETBSD
+#if SANITIZER_LINUX
+#include <sys/user.h>  // for user_regs_struct
+#if SANITIZER_ANDROID && SANITIZER_MIPS
+# include <asm/reg.h>  // for mips SP register in sys/user.h
+#endif
+#elif SANITIZER_NETBSD
+# include <signal.h>
 # define PTRACE_ATTACH PT_ATTACH
 # define PTRACE_GETREGS PT_GETREGS
 # define PTRACE_KILL PT_KILL
@@ -48,12 +53,6 @@
 # include <machine/reg.h>
 typedef struct reg user_regs;
 typedef struct reg user_regs_struct;
-#else
-# include <sys/user.h>  // for user_regs_struct
-# if SANITIZER_ANDROID && SANITIZER_MIPS
-#  include <asm/reg.h>  // for mips SP register in sys/user.h
-#  endif
-# endif
 #endif
 #include <sys/wait.h> // for signal-related stuff