diff options
| author | Colin Cross <ccross@android.com> | 2022-04-13 01:22:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-13 01:22:24 +0000 |
| commit | a9167328fc721c9637f0bcd87525cd23ff5ddac1 (patch) | |
| tree | 2ce94d7f0804ccb77d1fa9b2a1bca00eecdff1e2 /third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc | |
| parent | 7d5c00bbb9ff7b14de493bfa0ea56d4993f2e187 (diff) | |
| parent | 2f9c4b2c3bdefdfda50f145f6de999bc76327337 (diff) | |
| download | webrtc-a9167328fc721c9637f0bcd87525cd23ff5ddac1.tar.gz | |
Merge changes I0ab600cd,I1e74c64a am: 798f3afdf6 am: 2f9c4b2c3b
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/2062410
Change-Id: I95fedf2237deb626f888e92e7fd42544b2906b61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc')
| -rw-r--r-- | third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc index 2e7c2f404f..cf8c05160c 100644 --- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_powerpc-inl.inc +++ b/third_party/abseil-cpp/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 && |