blob: 4100cf63f7ffbf47910200d9d5a8c068d2c5ea21 [file] [log] [blame]
Andrew Geissler9aee5002022-03-30 16:27:02 +00001An all-in-one patch that fixes several issues:
2
31) UnscaledCycleClock not fully implemented for ppc*-musl (disabled on musl)
42) powerpc stacktrace implementation only works on glibc (disabled on musl)
53) powerpc stacktrace implementation has ppc64 assumptions (fixed)
64) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
7
8Sourced from void linux
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
Patrick Williams92b42cb2022-09-03 06:53:57 -050011Signed-off-by: Xu Huan <xuhuan.fnst@fujitsu.com>
12---
Patrick Williams520786c2023-06-25 16:20:36 -050013Upstream-Status: Pending
14
Patrick Williams92b42cb2022-09-03 06:53:57 -050015 absl/base/internal/unscaledcycleclock.cc | 4 ++--
16 absl/base/internal/unscaledcycleclock.h | 3 ++-
17 absl/debugging/internal/examine_stack.cc | 8 +++++++-
18 absl/debugging/internal/stacktrace_config.h | 2 +-
19 4 files changed, 12 insertions(+), 5 deletions(-)
Andrew Geissler9aee5002022-03-30 16:27:02 +000020
21--- a/absl/base/internal/unscaledcycleclock.cc
22+++ b/absl/base/internal/unscaledcycleclock.cc
23@@ -20,7 +20,7 @@
24 #include <intrin.h>
25 #endif
26
27-#if defined(__powerpc__) || defined(__ppc__)
28+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
29 #ifdef __GLIBC__
30 #include <sys/platform/ppc.h>
31 #elif defined(__FreeBSD__)
Patrick Williams92b42cb2022-09-03 06:53:57 -050032@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() {
Andrew Geissler9aee5002022-03-30 16:27:02 +000033 return base_internal::NominalCPUFrequency();
34 }
35
36-#elif defined(__powerpc__) || defined(__ppc__)
37+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
38
39 int64_t UnscaledCycleClock::Now() {
40 #ifdef __GLIBC__
Andrew Geissler9aee5002022-03-30 16:27:02 +000041--- a/absl/debugging/internal/examine_stack.cc
42+++ b/absl/debugging/internal/examine_stack.cc
Patrick Williams92b42cb2022-09-03 06:53:57 -050043@@ -33,6 +33,10 @@
Andrew Geissler9aee5002022-03-30 16:27:02 +000044 #include <csignal>
45 #include <cstdio>
46
47+#if defined(__powerpc__)
48+#include <asm/ptrace.h>
49+#endif
50+
51 #include "absl/base/attributes.h"
52 #include "absl/base/internal/raw_logging.h"
53 #include "absl/base/macros.h"
Andrew Geissler8f840682023-07-21 09:09:43 -050054@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc)
Andrew Geissler9aee5002022-03-30 16:27:02 +000055 return reinterpret_cast<void*>(context->uc_mcontext.pc);
56 #elif defined(__powerpc64__)
57 return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
58-#elif defined(__powerpc__)
59+#elif defined(__powerpc__) && defined(__GLIBC__)
60 return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
61+#elif defined(__powerpc__)
62+ return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->gregs[32]);
63 #elif defined(__riscv)
64 return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
65 #elif defined(__s390__) && !defined(__s390x__)
66--- a/absl/debugging/internal/stacktrace_config.h
67+++ b/absl/debugging/internal/stacktrace_config.h
Patrick Williams92b42cb2022-09-03 06:53:57 -050068@@ -60,7 +60,7 @@
Andrew Geissler9aee5002022-03-30 16:27:02 +000069 #elif defined(__i386__) || defined(__x86_64__)
70 #define ABSL_STACKTRACE_INL_HEADER \
71 "absl/debugging/internal/stacktrace_x86-inl.inc"
72-#elif defined(__ppc__) || defined(__PPC__)
73+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
74 #define ABSL_STACKTRACE_INL_HEADER \
75 "absl/debugging/internal/stacktrace_powerpc-inl.inc"
76 #elif defined(__aarch64__)
Andrew Geissler8f840682023-07-21 09:09:43 -050077--- a/absl/base/internal/unscaledcycleclock_config.h
78+++ b/absl/base/internal/unscaledcycleclock_config.h
79@@ -21,7 +21,8 @@
80
81 // The following platforms have an implementation of a hardware counter.
82 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
83- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
84+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
85+ defined(__riscv) || \
86 defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
87 #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
88 #else