blob: a4937e1b332ef55b9538f66b50154181bde93234 [file] [log] [blame]
Andrew Geissler32b11992021-03-31 13:37:05 -05001An 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>
11
12--- a/absl/base/internal/unscaledcycleclock.cc
13+++ b/absl/base/internal/unscaledcycleclock.cc
14@@ -20,7 +20,7 @@
15 #include <intrin.h>
16 #endif
17
18-#if defined(__powerpc__) || defined(__ppc__)
19+#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
20 #ifdef __GLIBC__
21 #include <sys/platform/ppc.h>
22 #elif defined(__FreeBSD__)
23@@ -59,7 +59,7 @@ double UnscaledCycleClock::Frequency() {
24 return base_internal::NominalCPUFrequency();
25 }
26
27-#elif defined(__powerpc__) || defined(__ppc__)
28+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
29
30 int64_t UnscaledCycleClock::Now() {
31 #ifdef __GLIBC__
32--- a/absl/base/internal/unscaledcycleclock.h
33+++ b/absl/base/internal/unscaledcycleclock.h
34@@ -46,7 +46,7 @@
35
36 // The following platforms have an implementation of a hardware counter.
37 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
38- defined(__powerpc__) || defined(__ppc__) || \
39+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
40 defined(_M_IX86) || defined(_M_X64)
41 #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
42 #else
43--- a/absl/debugging/internal/examine_stack.cc
44+++ b/absl/debugging/internal/examine_stack.cc
45@@ -27,6 +27,10 @@
46 #include <csignal>
47 #include <cstdio>
48
49+#if defined(__powerpc__)
50+#include <asm/ptrace.h>
51+#endif
52+
53 #include "absl/base/attributes.h"
54 #include "absl/base/internal/raw_logging.h"
55 #include "absl/base/macros.h"
William A. Kennington IIIb95905d2021-06-02 12:40:56 -070056@@ -63,8 +67,10 @@ void* GetProgramCounter(void* vuc) {
Andrew Geissler32b11992021-03-31 13:37:05 -050057 return reinterpret_cast<void*>(context->uc_mcontext.pc);
58 #elif defined(__powerpc64__)
59 return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
60-#elif defined(__powerpc__)
61+#elif defined(__powerpc__) && defined(__GLIBC__)
William A. Kennington IIIb95905d2021-06-02 12:40:56 -070062 return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
Andrew Geissler32b11992021-03-31 13:37:05 -050063+#elif defined(__powerpc__)
William A. Kennington IIIb95905d2021-06-02 12:40:56 -070064+ return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->gregs[32]);
Andrew Geissler32b11992021-03-31 13:37:05 -050065 #elif defined(__riscv)
66 return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
67 #elif defined(__s390__) && !defined(__s390x__)
68--- a/absl/debugging/internal/stacktrace_config.h
69+++ b/absl/debugging/internal/stacktrace_config.h
William A. Kennington IIIb95905d2021-06-02 12:40:56 -070070@@ -55,7 +55,7 @@
Andrew Geissler32b11992021-03-31 13:37:05 -050071 #elif defined(__i386__) || defined(__x86_64__)
72 #define ABSL_STACKTRACE_INL_HEADER \
73 "absl/debugging/internal/stacktrace_x86-inl.inc"
74-#elif defined(__ppc__) || defined(__PPC__)
75+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
76 #define ABSL_STACKTRACE_INL_HEADER \
77 "absl/debugging/internal/stacktrace_powerpc-inl.inc"
78 #elif defined(__aarch64__)