aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristy Norman <christy@linux.vnet.ibm.com>2018-07-31 16:11:46 -0400
committerChristy Norman <christy@linux.vnet.ibm.com>2018-07-31 16:11:46 -0400
commit5a85c65255c300a2affed941d495cf1d9a505f43 (patch)
treed9b347a63a761eaadac4378e1a86f66b1f95dbcd
parent9acad869d21731f5bc50430a33fe61cc0ffcbb0b (diff)
downloadabseil-5a85c65255c300a2affed941d495cf1d9a505f43.tar.gz
abseil-5a85c65255c300a2affed941d495cf1d9a505f43.tar.bz2
abseil-5a85c65255c300a2affed941d495cf1d9a505f43.zip
fix multiple define problem with ppc64le
building anything, e.g. envoy, that also builds gperftools, results in the error that StacktracePowerPCDummyFunction was previously defined. Rename this one, as its only a dummy function and is only used in this one place. Signed-off-by: Christy Norman <christy@linux.vnet.ibm.com>
-rw-r--r--absl/debugging/internal/stacktrace_powerpc-inl.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/absl/debugging/internal/stacktrace_powerpc-inl.inc b/absl/debugging/internal/stacktrace_powerpc-inl.inc
index 297bdadf..edf1947d 100644
--- a/absl/debugging/internal/stacktrace_powerpc-inl.inc
+++ b/absl/debugging/internal/stacktrace_powerpc-inl.inc
@@ -150,8 +150,8 @@ static void **NextStackFrame(void **old_sp, const void *uc) {
}
// This ensures that absl::GetStackTrace sets up the Link Register properly.
-void StacktracePowerPCDummyFunction() __attribute__((noinline));
-void StacktracePowerPCDummyFunction() { __asm__ volatile(""); }
+void AbslStacktracePowerPCDummyFunction() __attribute__((noinline));
+void AbslStacktracePowerPCDummyFunction() { __asm__ volatile(""); }
template <bool IS_STACK_FRAMES, bool IS_WITH_CONTEXT>
ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS // May read random elements from stack.
@@ -176,7 +176,7 @@ static int UnwindImpl(void** result, int* sizes, int max_depth, int skip_count,
// want here. While the compiler will always(?) set up LR for
// subroutine calls, it may not for leaf functions (such as this one).
// This routine forces the compiler (at least gcc) to push it anyway.
- StacktracePowerPCDummyFunction();
+ AbslStacktracePowerPCDummyFunction();
// The LR save area is used by the callee, so the top entry is bogus.
skip_count++;