  .../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.cc
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
 index c80724dd..052ce37c 100644
---- a/src/client/linux/dump_writer_common/ucontext_reader.cc
-+++ b/src/client/linux/dump_writer_common/ucontext_reader.cc
+--- a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
++++ b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/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;
  }
- 
+
 -void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
 +void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
    out->context_flags = MD_CONTEXT_ARM_FULL;
- 
+
    out->iregs[0] = uc->uc_mcontext.arm_r0;
 @@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
- 
+
  #elif defined(__aarch64__)
- 
+
 -uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
 +uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
    return uc->uc_mcontext.sp;
  }
- 
+
 -uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
 +uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
    return uc->uc_mcontext.pc;
  }
- 
+
 -void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
 +void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
                                      const struct fpsimd_context* fpregs) {
    out->context_flags = MD_CONTEXT_ARM64_FULL;
- 
+
 @@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc,
- 
+
  #elif defined(__mips__)
- 
+
 -uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) {
 +uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
    return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP];
  }
- 
+
 -uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) {
 +uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
    return uc->uc_mcontext.pc;
  }
- 
+
 -void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) {
 +void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) {
  #if _MIPS_SIM == _ABI64
    out->context_flags = MD_CONTEXT_MIPS64_FULL;
  #elif _MIPS_SIM == _ABIO32
-diff --git a/src/client/linux/dump_writer_common/ucontext_reader.h b/src/client/linux/dump_writer_common/ucontext_reader.h
+diff --git a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
 index b6e77b4b..2de80b70 100644
---- a/src/client/linux/dump_writer_common/ucontext_reader.h
-+++ b/src/client/linux/dump_writer_common/ucontext_reader.h
+--- a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
++++ b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
 @@ -39,23 +39,23 @@
  
  namespace google_breakpad {
- 
+
 -// Wraps platform-dependent implementations of accessors to ucontext structs.
 +// Wraps platform-dependent implementations of accessors to ucontext_t structs.
  struct UContextReader {
 -  static uintptr_t GetStackPointer(const struct ucontext* uc);
 +  static uintptr_t GetStackPointer(const ucontext_t* uc);
- 
+
 -  static uintptr_t GetInstructionPointer(const struct ucontext* uc);
 +  static uintptr_t GetInstructionPointer(const ucontext_t* uc);
- 
+
 -  // Juggle a arch-specific ucontext into a minidump format
 +  // Juggle a arch-specific ucontext_t into a minidump format
    //   out: the minidump structure

+  static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc);
 #endif
 };
 
diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
index 586d84e9..05936d28 100644
--- a/src/client/linux/handler/exception_handler.cc
+++ b/src/client/linux/handler/exception_handler.cc
@@ -457,9 +457,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) {
   // Fill in all the holes in the struct to make Valgrind happy.
   memset(&g_crash_context_, 0, sizeof(g_crash_context_));

   getcontext(&context);
   return HandleSignal(sig, &siginfo, &context);
 }
diff --git a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
index daba57e0..d246f601 100644
--- a/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
+++ b/qtwebengine/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
@@ -191,11 +191,11 @@ class ExceptionHandler {
   struct CrashContext {
     siginfo_t siginfo;
