buildroot
Public
Source
committed ca4009fc24exxxxxxxxxxFrom 7975a962e1d6dbad5a46792a54e647abd7caf5f1 Mon Sep 17 00:00:00 2001From: Mark Mentovai <mark@chromium.org>Date: Tue, 19 Sep 2017 22:48:30 -0400Subject: [PATCH] Replace remaining references to 'struct ucontext' with 'ucontext_t'This relandshttps://chromium.googlesource.com/breakpad/breakpad/src/+/e3035bc406cee8a4d765e59ad46eb828705f17f4,which was accidentally committed to breakpad/breakpad/src, the read-onlymirror of src in breakpad/breakpad. (Well, it should have beenread-only.) See https://crbug.com/766164.This fixes issues with glibc-2.26.See https://bugs.gentoo.org/show_bug.cgi?id=628782 ,https://sourceware.org/git/?p=glibc.git;h=251287734e89a52da3db682a8241eb6bccc050c9 , andhttps://sourceware.org/ml/libc-alpha/2017-08/msg00010.html for context.Change-Id: Id66f474d636dd2afa450bab925c5514a800fdd6fReviewed-on: https://chromium-review.googlesource.com/674304Reviewed-by: Mark Mentovai <mark@chromium.org>(cherry picked from commit bddcc58860f522a0d4cbaa7e9d04058caee0db9d)[Romain: backport from upstream]Signed-off-by: Romain Naour <romain.naour@gmail.com>--- .../linux/dump_writer_common/ucontext_reader.cc | 32 +++++++++++----------- .../linux/dump_writer_common/ucontext_reader.h | 14 +++++----- src/client/linux/handler/exception_handler.cc | 10 +++---- src/client/linux/handler/exception_handler.h | 6 ++-- .../linux/microdump_writer/microdump_writer.cc | 2 +- .../linux/minidump_writer/minidump_writer.cc | 2 +- 6 files changed, 33 insertions(+), 33 deletions(-)diff --git a/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/client/linux/dump_writer_common/ucontext_reader.ccindex c80724d..052ce37 100644--- a/src/client/linux/dump_writer_common/ucontext_reader.cc+++ b/src/client/linux/dump_writer_common/ucontext_reader.cc@@ -36,19 +36,19 @@ namespace google_breakpad { // Minidump defines register structures which are different from the raw // structures which we get from the kernel. These are platform specific-// functions to juggle the ucontext and user structures into minidump format.+// functions to juggle the ucontext_t and user structures into minidump format. #if defined(__i386__)-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { return uc->uc_mcontext.gregs[REG_ESP]; }-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { return uc->uc_mcontext.gregs[REG_EIP]; }-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct _libc_fpstate* fp) { const greg_t* regs = uc->uc_mcontext.gregs;@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, #elif defined(__x86_64)-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { return uc->uc_mcontext.gregs[REG_RSP]; }-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { return uc->uc_mcontext.gregs[REG_RIP]; }-void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, const struct _libc_fpstate* fpregs) { const greg_t* regs = uc->uc_mcontext.gregs;@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, #elif defined(__ARM_EABI__)-uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { return uc->uc_mcontext.arm_sp; }-uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { return uc->uc_mcontext.arm_pc;