|
14 | 14 | @@ -20,7 +20,7 @@ |
15 | 15 | #include <intrin.h> |
16 | 16 | #endif |
17 | | - |
| 17 | + |
18 | 18 | -#if defined(__powerpc__) || defined(__ppc__) |
19 | 19 | +#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) |
20 | 20 | #ifdef __GLIBC__ |
21 | 21 | #include <sys/platform/ppc.h> |
22 | 22 | #elif defined(__FreeBSD__) |
23 | | -@@ -59,7 +59,7 @@ double UnscaledCycleClock::Frequency() { |
| 23 | +@@ -53,7 +53,7 @@ double UnscaledCycleClock::Frequency() { |
24 | 24 | return base_internal::NominalCPUFrequency(); |
25 | 25 | } |
26 | | - |
| 26 | + |
27 | 27 | -#elif defined(__powerpc__) || defined(__ppc__) |
28 | 28 | +#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) |
29 | | - |
| 29 | + |
30 | 30 | int64_t UnscaledCycleClock::Now() { |
31 | 31 | #ifdef __GLIBC__ |
32 | 32 | --- a/absl/base/internal/unscaledcycleclock.h |
33 | 33 | +++ b/absl/base/internal/unscaledcycleclock.h |
34 | 34 | @@ -46,7 +46,8 @@ |
35 | | - |
| 35 | + |
36 | 36 | // The following platforms have an implementation of a hardware counter. |
37 | 37 | #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ |
38 | 38 | - defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ |
39 | 39 | + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ |
40 | 40 | + defined(__riscv) || \ |
41 | | - defined(_M_IX86) || defined(_M_X64) |
| 41 | + defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) |
42 | 42 | #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 |
43 | 43 | #else |
44 | 44 | --- a/absl/debugging/internal/examine_stack.cc |
45 | 45 | +++ b/absl/debugging/internal/examine_stack.cc |
46 | | -@@ -27,6 +27,10 @@ |
| 46 | +@@ -33,6 +33,10 @@ |
47 | 47 | #include <csignal> |
48 | 48 | #include <cstdio> |
49 | | - |
| 49 | + |
50 | 50 | +#if defined(__powerpc__) |
51 | 51 | +#include <asm/ptrace.h> |
52 | 52 | +#endif |
53 | 53 | + |
54 | 54 | #include "absl/base/attributes.h" |
55 | 55 | #include "absl/base/internal/raw_logging.h" |
56 | 56 | #include "absl/base/macros.h" |
57 | | -@@ -63,8 +67,10 @@ void* GetProgramCounter(void* vuc) { |
| 57 | +@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) { |
58 | 58 | return reinterpret_cast<void*>(context->uc_mcontext.pc); |
59 | 59 | #elif defined(__powerpc64__) |
60 | 60 | return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); |
|
68 | 68 | #elif defined(__s390__) && !defined(__s390x__) |
69 | 69 | --- a/absl/debugging/internal/stacktrace_config.h |
70 | 70 | +++ b/absl/debugging/internal/stacktrace_config.h |
71 | | -@@ -59,7 +59,7 @@ |
| 71 | +@@ -60,7 +60,7 @@ |
72 | 72 | #elif defined(__i386__) || defined(__x86_64__) |
73 | 73 | #define ABSL_STACKTRACE_INL_HEADER \ |
74 | 74 | "absl/debugging/internal/stacktrace_x86-inl.inc" |
|
0 commit comments