Module Name: src Committed By: mrg Date: Wed Oct 2 05:04:59 UTC 2019
Modified Files: src/external/gpl3/gcc/dist/gcc/config/alpha: elf.h src/external/gpl3/gcc/dist/libsanitizer/asan: asan_stack.h src/external/gpl3/gcc/dist/libsanitizer/lsan: lsan_allocator.cc src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common: sanitizer_stoptheworld_linux_libcdep.cc Log Message: don't undef SDB_DEBUGGING_INFO. obsolete (and triggers a warning.) disable isInDeadlySignal() for now. fix some compile errors in asan and lsan. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc 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/dist/gcc/config/alpha/elf.h diff -u src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h:1.9 src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h:1.10 --- src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h:1.9 Tue Oct 1 10:38:17 2019 +++ src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h Wed Oct 2 05:04:58 2019 @@ -22,8 +22,6 @@ along with GCC; see the file COPYING3. #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 Index: src/external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h diff -u src/external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h:1.4 src/external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h:1.5 --- src/external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h:1.4 Sat Jan 19 12:10:11 2019 +++ src/external/gpl3/gcc/dist/libsanitizer/asan/asan_stack.h Wed Oct 2 05:04:58 2019 @@ -42,7 +42,7 @@ void GetStackTraceWithPcBpAndContext(Buf // 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); Index: src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc diff -u src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc:1.4 src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc:1.5 --- src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc:1.4 Tue Oct 1 21:13:44 2019 +++ src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc Wed Oct 2 05:04:58 2019 @@ -28,8 +28,7 @@ namespace __lsan { 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; Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.8 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.9 --- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc:1.8 Tue Oct 1 11:49:13 2019 +++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc Wed Oct 2 05:04:59 2019 @@ -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