Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame^] | 1 | From 102dcce6610e6606fffd3a4986f84eb52177f8c8 Mon Sep 17 00:00:00 2001 |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 13 Mar 2021 10:26:25 -0800 |
| 4 | Subject: [PATCH] An all-in-one patch that fixes several issues: |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 5 | |
| 6 | 1) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl) |
| 7 | 2) powerpc stacktrace implementation only works on glibc (disabled on musl) |
| 8 | 3) powerpc stacktrace implementation has ppc64 assumptions (fixed) |
| 9 | 4) examine_stack.cpp makes glibc assumptions on powerpc (fixed) |
| 10 | |
| 11 | Sourced from void linux |
| 12 | |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 13 | Upstream-Status: Pending |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 15 | Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com> |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 16 | --- |
| 17 | .../abseil-cpp/absl/base/internal/unscaledcycleclock.cc | 4 ++-- |
| 18 | .../absl/base/internal/unscaledcycleclock_config.h | 3 ++- |
| 19 | .../abseil-cpp/absl/debugging/internal/examine_stack.cc | 8 +++++++- |
| 20 | .../absl/debugging/internal/stacktrace_config.h | 2 +- |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 21 | 4 files changed, 12 insertions(+), 5 deletions(-) |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 22 | |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 23 | diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc |
Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame^] | 24 | index 05e0e7b..f11fecb 100644 |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 25 | --- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc |
| 26 | +++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 27 | @@ -20,7 +20,7 @@ |
| 28 | #include <intrin.h> |
| 29 | #endif |
| 30 | |
| 31 | -#if defined(__powerpc__) || defined(__ppc__) |
| 32 | +#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) |
| 33 | #ifdef __GLIBC__ |
| 34 | #include <sys/platform/ppc.h> |
| 35 | #elif defined(__FreeBSD__) |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 36 | @@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 37 | return base_internal::NominalCPUFrequency(); |
| 38 | } |
| 39 | |
| 40 | -#elif defined(__powerpc__) || defined(__ppc__) |
| 41 | +#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) |
| 42 | |
| 43 | int64_t UnscaledCycleClock::Now() { |
| 44 | #ifdef __GLIBC__ |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 45 | diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h |
| 46 | index 24b324a..5e232c1 100644 |
| 47 | --- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h |
| 48 | +++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h |
| 49 | @@ -21,7 +21,8 @@ |
| 50 | |
| 51 | // The following platforms have an implementation of a hardware counter. |
| 52 | #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ |
| 53 | - defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ |
| 54 | + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ |
| 55 | + defined(__riscv) || \ |
| 56 | defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) |
| 57 | #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 |
| 58 | #else |
| 59 | diff --git a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc |
Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame^] | 60 | index 3dd6ba1..9f0601c 100644 |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 61 | --- a/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc |
| 62 | +++ b/third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc |
Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame^] | 63 | @@ -36,6 +36,10 @@ |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 64 | #include <csignal> |
| 65 | #include <cstdio> |
| 66 | |
| 67 | +#if defined(__powerpc__) |
| 68 | +#include <asm/ptrace.h> |
| 69 | +#endif |
| 70 | + |
| 71 | #include "absl/base/attributes.h" |
| 72 | #include "absl/base/internal/raw_logging.h" |
| 73 | #include "absl/base/macros.h" |
Patrick Williams | 03514f1 | 2024-04-05 07:04:11 -0500 | [diff] [blame^] | 74 | @@ -177,8 +181,10 @@ void* GetProgramCounter(void* const vuc) { |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 75 | return reinterpret_cast<void*>(context->uc_mcontext.pc); |
| 76 | #elif defined(__powerpc64__) |
| 77 | return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); |
| 78 | -#elif defined(__powerpc__) |
| 79 | +#elif defined(__powerpc__) && defined(__GLIBC__) |
| 80 | return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]); |
| 81 | +#elif defined(__powerpc__) |
| 82 | + return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->gregs[32]); |
| 83 | #elif defined(__riscv) |
| 84 | return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); |
| 85 | #elif defined(__s390__) && !defined(__s390x__) |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 86 | diff --git a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h |
| 87 | index 3929b1b..23d5e50 100644 |
| 88 | --- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h |
| 89 | +++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h |
Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame] | 90 | @@ -60,7 +60,7 @@ |
Andrew Geissler | 9aee500 | 2022-03-30 16:27:02 +0000 | [diff] [blame] | 91 | #elif defined(__i386__) || defined(__x86_64__) |
| 92 | #define ABSL_STACKTRACE_INL_HEADER \ |
| 93 | "absl/debugging/internal/stacktrace_x86-inl.inc" |
| 94 | -#elif defined(__ppc__) || defined(__PPC__) |
| 95 | +#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__) |
| 96 | #define ABSL_STACKTRACE_INL_HEADER \ |
| 97 | "absl/debugging/internal/stacktrace_powerpc-inl.inc" |
| 98 | #elif defined(__aarch64__) |