blob: 9b408259f935e1f1f9cb74614a6af346a7be2c08 [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
Patrick Williams03907ee2022-05-01 06:28:52 -050017
Andrew Geissler32b11992021-03-31 13:37:05 -050018-#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__)
Patrick Williams975a06f2022-10-21 14:42:47 -050023@@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() {
Andrew Geissler32b11992021-03-31 13:37:05 -050024 return base_internal::NominalCPUFrequency();
25 }
Patrick Williams03907ee2022-05-01 06:28:52 -050026
Andrew Geissler32b11992021-03-31 13:37:05 -050027-#elif defined(__powerpc__) || defined(__ppc__)
28+#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)
Patrick Williams03907ee2022-05-01 06:28:52 -050029
Andrew Geissler32b11992021-03-31 13:37:05 -050030 int64_t UnscaledCycleClock::Now() {
31 #ifdef __GLIBC__
Patrick Williams975a06f2022-10-21 14:42:47 -050032--- a/absl/base/internal/unscaledcycleclock_config.h
33+++ b/absl/base/internal/unscaledcycleclock_config.h
34@@ -21,7 +21,8 @@
Patrick Williams03907ee2022-05-01 06:28:52 -050035
Andrew Geissler32b11992021-03-31 13:37:05 -050036 // The following platforms have an implementation of a hardware counter.
37 #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
Andrew Geissler9aee5002022-03-30 16:27:02 +000038- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
39+ ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
40+ defined(__riscv) || \
Patrick Williams03907ee2022-05-01 06:28:52 -050041 defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
Andrew Geissler32b11992021-03-31 13:37:05 -050042 #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
43 #else
44--- a/absl/debugging/internal/examine_stack.cc
45+++ b/absl/debugging/internal/examine_stack.cc
Patrick Williams03907ee2022-05-01 06:28:52 -050046@@ -33,6 +33,10 @@
Andrew Geissler32b11992021-03-31 13:37:05 -050047 #include <csignal>
48 #include <cstdio>
Patrick Williams03907ee2022-05-01 06:28:52 -050049
Andrew Geissler32b11992021-03-31 13:37:05 -050050+#if defined(__powerpc__)
51+#include <asm/ptrace.h>
52+#endif
53+
54 #include "absl/base/attributes.h"
55 #include "absl/base/internal/raw_logging.h"
56 #include "absl/base/macros.h"
Patrick Williams03907ee2022-05-01 06:28:52 -050057@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) {
Andrew Geissler32b11992021-03-31 13:37:05 -050058 return reinterpret_cast<void*>(context->uc_mcontext.pc);
59 #elif defined(__powerpc64__)
60 return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
61-#elif defined(__powerpc__)
62+#elif defined(__powerpc__) && defined(__GLIBC__)
William A. Kennington IIIb95905d2021-06-02 12:40:56 -070063 return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
Andrew Geissler32b11992021-03-31 13:37:05 -050064+#elif defined(__powerpc__)
Andrew Geissler9aee5002022-03-30 16:27:02 +000065+ return reinterpret_cast<void*>((context->uc_regs)->gregs[32]);
Andrew Geissler32b11992021-03-31 13:37:05 -050066 #elif defined(__riscv)
67 return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
68 #elif defined(__s390__) && !defined(__s390x__)
69--- a/absl/debugging/internal/stacktrace_config.h
70+++ b/absl/debugging/internal/stacktrace_config.h
Patrick Williams03907ee2022-05-01 06:28:52 -050071@@ -60,7 +60,7 @@
Andrew Geissler32b11992021-03-31 13:37:05 -050072 #elif defined(__i386__) || defined(__x86_64__)
73 #define ABSL_STACKTRACE_INL_HEADER \
74 "absl/debugging/internal/stacktrace_x86-inl.inc"
75-#elif defined(__ppc__) || defined(__PPC__)
76+#elif (defined(__ppc__) || defined(__PPC__)) && defined(__GLIBC__)
77 #define ABSL_STACKTRACE_INL_HEADER \
78 "absl/debugging/internal/stacktrace_powerpc-inl.inc"
79 #elif defined(__aarch64__)