grpc: unbreak abseil again
This commit is contained in:
parent
9e6e3dbcdf
commit
41e600cd5c
|
@ -36,6 +36,20 @@ An all-in-one patch that fixes several issues:
|
||||||
defined(_M_IX86) || defined(_M_X64)
|
defined(_M_IX86) || defined(_M_X64)
|
||||||
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
|
#define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1
|
||||||
#else
|
#else
|
||||||
|
--- third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
|
||||||
|
+++ third_party/abseil-cpp/absl/debugging/internal/examine_stack.cc
|
||||||
|
@@ -63,8 +63,10 @@ void* GetProgramCounter(void* vuc) {
|
||||||
|
return reinterpret_cast<void*>(context->uc_mcontext.pc);
|
||||||
|
#elif defined(__powerpc64__)
|
||||||
|
return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]);
|
||||||
|
-#elif defined(__powerpc__)
|
||||||
|
+#elif defined(__powerpc__) && defined(__GLIBC__)
|
||||||
|
return reinterpret_cast<void*>(context->uc_mcontext.uc_regs->gregs[32]);
|
||||||
|
+#elif defined(__powerpc__)
|
||||||
|
+ return reinterpret_cast<void*>(context->uc_mcontext.gregs[32]);
|
||||||
|
#elif defined(__riscv)
|
||||||
|
return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]);
|
||||||
|
#elif defined(__s390__) && !defined(__s390x__)
|
||||||
--- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
|
--- third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
|
||||||
+++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
|
+++ third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h
|
||||||
@@ -64,7 +64,7 @@
|
@@ -64,7 +64,7 @@
|
||||||
|
|
Loading…
Reference in New Issue