diff options
Diffstat (limited to 'community/chromium/musl-fixes-breakpad.patch')
| -rw-r--r-- | community/chromium/musl-fixes-breakpad.patch | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/community/chromium/musl-fixes-breakpad.patch b/community/chromium/musl-fixes-breakpad.patch index 2cbf88ca20..a86535abec 100644 --- a/community/chromium/musl-fixes-breakpad.patch +++ b/community/chromium/musl-fixes-breakpad.patch @@ -1,8 +1,6 @@ -diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -index 052ce37..95b0fb4 100644 ---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +--- ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +++ ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { +@@ -49,7 +49,7 @@ } void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, @@ -11,7 +9,7 @@ index 052ce37..95b0fb4 100644 const greg_t* regs = uc->uc_mcontext.gregs; out->context_flags = MD_CONTEXT_X86_FULL | -@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { +@@ -97,7 +97,7 @@ } void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, @@ -20,11 +18,9 @@ index 052ce37..95b0fb4 100644 const greg_t* regs = uc->uc_mcontext.gregs; out->context_flags = MD_CONTEXT_AMD64_FULL; -diff --git a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -index 2de80b7..4cf1377 100644 ---- a/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +--- ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +++ ./third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -50,7 +50,7 @@ struct UContextReader { +@@ -50,7 +50,7 @@ // info: the collection of register structures. #if defined(__i386__) || defined(__x86_64) static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, @@ -33,11 +29,9 @@ index 2de80b7..4cf1377 100644 #elif defined(__aarch64__) static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct fpsimd_context* fpregs); -diff --git a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -index d1dc331..d1cc562 100644 ---- a/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +--- ./third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +++ ./third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -@@ -48,7 +48,7 @@ class ExceptionHandler; +@@ -48,7 +48,7 @@ #if defined(__aarch64__) typedef struct fpsimd_context fpstate_t; #elif !defined(__ARM_EABI__) && !defined(__mips__) @@ -46,7 +40,7 @@ index d1dc331..d1cc562 100644 #endif // These entries store a list of memory regions that the client wants included ---- ./breakpad/src/common/linux/elf_core_dump.h.orig +--- ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h +++ ./third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h @@ -36,6 +36,7 @@ #include <elf.h> @@ -68,9 +62,9 @@ index d1dc331..d1cc562 100644 static const int kClass = ELFCLASS64; #else #error "Unsupported __WORDSIZE for ElfCoreDump." ---- ./third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.orig +--- ./third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +++ ./third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc -@@ -495,7 +495,9 @@ +@@ -490,7 +490,9 @@ siginfo.si_code = SI_USER; siginfo.si_pid = getpid(); ucontext_t context; @@ -80,11 +74,10 @@ index d1dc331..d1cc562 100644 return HandleSignal(sig, &siginfo, &context); } -@@ -680,9 +682,14 @@ +@@ -675,9 +677,13 @@ sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); CrashContext context; -+ +#if defined(__GLIBC__) int getcontext_result = getcontext(&context.context); if (getcontext_result) |