forked from kiss-community/repo
64 lines
3.5 KiB
Diff
64 lines
3.5 KiB
Diff
|
From 1f839bf6ac48d81a8acbf3def4f57a555a05fa18 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
|
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 <raj.khem@gmail.com>
|
||
|
|
---
|
||
|
|
.../src/client/linux/dump_writer_common/ucontext_reader.cc | 4 ++--
|
||
|
|
.../src/client/linux/dump_writer_common/ucontext_reader.h | 2 +-
|
||
|
|
.../src/client/linux/minidump_writer/minidump_writer.h | 2 +-
|
||
|
|
3 files changed, 4 insertions(+), 4 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 6ee6cc1e4cd..a8f9ccc72ac 100644
|
||
|
|
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||
|
|
+++ b/src/3rdparty/chromium/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) {
|
||
|
|
}
|
||
|
|
|
||
|
|
void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||
|
|
- const struct _libc_fpstate* fp) {
|
||
|
|
+ const struct _fpstate* fp) {
|
||
|
|
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) {
|
||
|
|
}
|
||
|
|
|
||
|
|
void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||
|
|
- const struct _libc_fpstate* fpregs) {
|
||
|
|
+ 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 f830618f240..f3dde1f4dff 100644
|
||
|
|
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||
|
|
+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||
|
|
@@ -50,7 +50,7 @@ struct UContextReader {
|
||
|
|
// info: the collection of register structures.
|
||
|
|
#if defined(__i386__) || defined(__x86_64)
|
||
|
|
static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||
|
|
- const struct _libc_fpstate* fp);
|
||
|
|
+ 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 d1dc331215a..d1cc5624cd4 100644
|
||
|
|
--- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||
|
|
+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||
|
|
@@ -48,7 +48,7 @@ class ExceptionHandler;
|
||
|
|
#if defined(__aarch64__)
|
||
|
|
typedef struct fpsimd_context fpstate_t;
|
||
|
|
#elif !defined(__ARM_EABI__) && !defined(__mips__)
|
||
|
|
-typedef struct _libc_fpstate fpstate_t;
|
||
|
|
+typedef struct _fpstate fpstate_t;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
// These entries store a list of memory regions that the client wants included
|