diff options
author | Mark Mentovai <mark@chromium.org> | 2017-09-19 22:48:30 -0400 |
---|---|---|
committer | Mark Mentovai <mark@chromium.org> | 2017-09-20 11:50:04 +0000 |
commit | bddcc58860f522a0d4cbaa7e9d04058caee0db9d (patch) | |
tree | 2380f4bcaf6090341c2aa8d1eb7ba06392159edc /src/client/linux/handler | |
parent | Fix googletest/googlemock build (diff) | |
download | breakpad-bddcc58860f522a0d4cbaa7e9d04058caee0db9d.tar.xz |
Replace remaining references to 'struct ucontext' with 'ucontext_t'
This relands
https://chromium.googlesource.com/breakpad/breakpad/src/+/e3035bc406cee8a4d765e59ad46eb828705f17f4,
which was accidentally committed to breakpad/breakpad/src, the read-only
mirror of src in breakpad/breakpad. (Well, it should have been
read-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 , and
https://sourceware.org/ml/libc-alpha/2017-08/msg00010.html for context.
Change-Id: Id66f474d636dd2afa450bab925c5514a800fdd6f
Reviewed-on: https://chromium-review.googlesource.com/674304
Reviewed-by: Mark Mentovai <mark@chromium.org>
Diffstat (limited to 'src/client/linux/handler')
-rw-r--r-- | src/client/linux/handler/exception_handler.cc | 10 | ||||
-rw-r--r-- | src/client/linux/handler/exception_handler.h | 6 |
2 files changed, 8 insertions, 8 deletions
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_)); memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); - memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); + memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); #if defined(__aarch64__) - struct ucontext* uc_ptr = (struct ucontext*)uc; + ucontext_t* uc_ptr = (ucontext_t*)uc; struct fpsimd_context* fp_ptr = (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; if (fp_ptr->head.magic == FPSIMD_MAGIC) { @@ -468,9 +468,9 @@ bool ExceptionHandler::HandleSignal(int /*sig*/, siginfo_t* info, void* uc) { } #elif !defined(__ARM_EABI__) && !defined(__mips__) // FP state is not part of user ABI on ARM Linux. - // In case of MIPS Linux FP state is already part of struct ucontext + // In case of MIPS Linux FP state is already part of ucontext_t // and 'float_state' is not a member of CrashContext. - struct ucontext* uc_ptr = (struct ucontext*)uc; + ucontext_t* uc_ptr = (ucontext_t*)uc; if (uc_ptr->uc_mcontext.fpregs) { memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, sizeof(g_crash_context_.float_state)); @@ -494,7 +494,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { // ExceptionHandler::HandleSignal(). siginfo.si_code = SI_USER; siginfo.si_pid = getpid(); - struct ucontext context; + ucontext_t context; getcontext(&context); return HandleSignal(sig, &siginfo, &context); } diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h index daba57e0..d246f601 100644 --- a/src/client/linux/handler/exception_handler.h +++ b/src/client/linux/handler/exception_handler.h @@ -191,11 +191,11 @@ class ExceptionHandler { struct CrashContext { siginfo_t siginfo; pid_t tid; // the crashing thread. - struct ucontext context; + ucontext_t context; #if !defined(__ARM_EABI__) && !defined(__mips__) // #ifdef this out because FP state is not part of user ABI for Linux ARM. - // In case of MIPS Linux FP state is already part of struct - // ucontext so 'float_state' is not required. + // In case of MIPS Linux FP state is already part of ucontext_t so + // 'float_state' is not required. fpstate_t float_state; #endif }; |