From 0ba1b3e35e7c743b670bedc3e90001dfb868df10 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Sun, 1 Feb 2015 13:45:51 +0100 Subject: [PATCH 2/6] Use _fpstate instead of _libc_fpstate on linux glibc defines both. musl libc only the former. --- 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(-) Index: git/src/client/linux/dump_writer_common/ucontext_reader.cc =================================================================== --- git.orig/src/client/linux/dump_writer_common/ucontext_reader.cc +++ git/src/client/linux/dump_writer_common/ucontext_reader.cc @@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstruction } 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::GetInstruction } 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; Index: git/src/client/linux/dump_writer_common/ucontext_reader.h =================================================================== --- git.orig/src/client/linux/dump_writer_common/ucontext_reader.h +++ git/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); Index: git/src/client/linux/minidump_writer/minidump_writer.h =================================================================== --- git.orig/src/client/linux/minidump_writer/minidump_writer.h +++ git/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