@@ -7,22 +7,9 @@ An all-in-one patch that fixes several issues:
772) powerpc stacktrace implementation only works on glibc (disabled on musl)
884) examine_stack.cpp makes glibc assumptions on powerpc (fixed)
99
10- --- a/abseil-cpp/absl/base/internal/unscaledcycleclock.h
11- +++ b/abseil-cpp/absl/base/internal/unscaledcycleclock.h
12- @@ -46,8 +46,8 @@
13-
14- // The following platforms have an implementation of a hardware counter.
15- #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
16- - defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \
17- - defined(_M_IX86) || defined(_M_X64)
18- + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \
19- + defined(__riscv) || defined(_M_IX86) || defined(_M_X64)
20- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
21- #else
22- #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0
2310--- a/abseil-cpp/absl/debugging/internal/examine_stack.cc
2411+++ b/abseil-cpp/absl/debugging/internal/examine_stack.cc
25- @@ -27 ,6 +27 ,10 @@
12+ @@ -36 ,6 +36 ,10 @@
2613 #include <csignal>
2714 #include <cstdio>
2815
@@ -33,21 +20,21 @@ An all-in-one patch that fixes several issues:
3320 #include "absl/base/attributes.h"
3421 #include "absl/base/internal/raw_logging.h"
3522 #include "absl/base/macros.h"
36- @@ -63 ,8 +67 ,10 @@ void* GetProgramCounter(void* vuc) {
23+ @@ -177 ,8 +181 ,10 @@ void* GetProgramCounter(void* const vuc)
3724 return reinterpret_cast<void*>(context->uc_mcontext.pc);
3825 #elif defined(__powerpc64__)
3926 return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
27+ - #elif defined(__powerpc__)
4028+ #elif defined(__powerpc__) && defined(__GLIBC__)
41- + return reinterpret_cast<void*>(context->uc_mcontext.regs->nip);
42- #elif defined(__powerpc__)
43- - return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
29+ return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
30+ + #elif defined(__powerpc__)
4431+ return reinterpret_cast<void*>(((struct pt_regs *)context->uc_regs)->nip);
4532 #elif defined(__riscv)
4633 return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
4734 #elif defined(__s390__) && !defined(__s390x__)
4835--- a/abseil-cpp/absl/debugging/internal/stacktrace_config.h
4936+++ b/abseil-cpp/absl/debugging/internal/stacktrace_config.h
50- @@ -59 ,7 +59 ,7 @@
37+ @@ -67 ,7 +67 ,7 @@
5138 #elif defined(__i386__) || defined(__x86_64__)
5239 #define ABSL_STACKTRACE_INL_HEADER \
5340 "absl/debugging/internal/stacktrace_x86-inl.inc"
@@ -56,3 +43,16 @@ An all-in-one patch that fixes several issues:
5643 #define ABSL_STACKTRACE_INL_HEADER \
5744 "absl/debugging/internal/stacktrace_powerpc-inl.inc"
5845 #elif defined(__aarch64__)
46+ --- a/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
47+ +++ b/abseil-cpp/absl/base/internal/unscaledcycleclock_config.h
48+ @@ -21,8 +21,8 @@
49+
50+ // The following platforms have an implementation of a hardware counter.
51+ #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \
52+ - defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) || \
53+ - (defined(_M_X64) && !defined(_M_ARM64EC))
54+ + (defined(__powerpc__) || defined(__ppc__) && defined(__GLIBC__)) || \
55+ + defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC))
56+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
57+ #else
58+ #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0
0 commit comments