diff options
| author | Benjamin Barenblat <bbaren@google.com> | 2021-04-08 10:23:55 -0400 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@google.com> | 2021-04-08 10:23:55 -0400 |
| commit | feac56827dd1f0d159ea0bcf2ce37ef1990ac743 (patch) | |
| tree | bc8ca767be02a5b22118108f9712b72ec64064c3 /absl/debugging/internal/stacktrace_powerpc-inl.inc | |
| parent | 2b91b17d526b464840a3f45504c594cdb50152c5 (diff) | |
| parent | 997aaf3a28308eba1b9156aa35ab7bca9688e9f6 (diff) | |
| download | abseil-feac56827dd1f0d159ea0bcf2ce37ef1990ac743.tar.gz abseil-feac56827dd1f0d159ea0bcf2ce37ef1990ac743.tar.bz2 abseil-feac56827dd1f0d159ea0bcf2ce37ef1990ac743.zip | |
Merge new upstream LTS 20210324.0
Diffstat (limited to 'absl/debugging/internal/stacktrace_powerpc-inl.inc')
| -rw-r--r-- | absl/debugging/internal/stacktrace_powerpc-inl.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/absl/debugging/internal/stacktrace_powerpc-inl.inc b/absl/debugging/internal/stacktrace_powerpc-inl.inc index 2e7c2f40..cf8c0516 100644 --- a/absl/debugging/internal/stacktrace_powerpc-inl.inc +++ b/absl/debugging/internal/stacktrace_powerpc-inl.inc @@ -131,7 +131,12 @@ static void **NextStackFrame(void **old_sp, const void *uc) { const ucontext_t* signal_context = reinterpret_cast<const ucontext_t*>(uc); void **const sp_before_signal = - reinterpret_cast<void**>(signal_context->uc_mcontext.gp_regs[PT_R1]); +#if defined(__PPC64__) + reinterpret_cast<void **>(signal_context->uc_mcontext.gp_regs[PT_R1]); +#else + reinterpret_cast<void **>( + signal_context->uc_mcontext.uc_regs->gregs[PT_R1]); +#endif // Check that alleged sp before signal is nonnull and is reasonably // aligned. if (sp_before_signal != nullptr && |