From 46283c0005cfb5d882b76df89a5c4fd880c0de42 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 25 Sep 2018 12:35:07 -0700 Subject: [PATCH] chromium: musl: Use _fpstate instead of _libc_fpstate on linux glibc defines both. musl libc only the former. Signed-off-by: Khem Raj --- .../client/linux/dump_writer_common/ucontext_reader.cc | 8 ++++---- .../src/client/linux/dump_writer_common/ucontext_reader.h | 4 ++-- .../src/client/linux/minidump_writer/minidump_writer.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc index 6eec1be2465..57d91943e83 100644 --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc @@ -48,8 +48,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { return uc->uc_mcontext.gregs[REG_EIP]; } -void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc, - const fpstate_t* fp) { +void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _fpstate* fp) { const greg_t* regs = uc->uc_mcontext.gregs; out->context_flags = MD_CONTEXT_X86_FULL | @@ -96,8 +96,8 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { return uc->uc_mcontext.gregs[REG_RIP]; } -void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc, - const fpstate_t* fpregs) { +void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _fpstate* fpregs) { const greg_t* regs = uc->uc_mcontext.gregs; out->context_flags = MD_CONTEXT_AMD64_FULL; diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h index 7d41008815f..6cacabe4369 100644 --- a/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h @@ -50,8 +50,8 @@ struct UContextReader { // out: the minidump structure // info: the collection of register structures. #if defined(__i386__) || defined(__x86_64) - static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc, - const fpstate_t* fp); + static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, + const struct _fpstate* fp); #elif defined(__aarch64__) static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc, const struct fpsimd_context* fpregs); diff --git a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h index e3b0b16daea..5d144dcd27c 100644 --- a/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h +++ b/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h @@ -49,7 +49,7 @@ class ExceptionHandler; #if defined(__aarch64__) typedef struct fpsimd_context fpstate_t; #elif !defined(__ARM_EABI__) && !defined(__mips__) -typedef std::remove_pointer::type fpstate_t; +typedef struct _fpstate fpstate_t; #endif // These entries store a list of memory regions that the client wants included