mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #152 from clnperez/fix-multi-defines-ppc64le

Browse source 
fix multiple define problem with ppc64le
This commit is contained in:
Derek Mauro 2018-08-01 14:37:53 -04:00 • committed by GitHub
commit 92e07e5590
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
absl/debugging/internal/stacktrace_powerpc-inl.inc
View file

@ -31,6 +31,8 @@
#include <cstdint> #include <cstdint>
#include <cstdio> #include <cstdio>
#include "absl/base/attributes.h"
#include "absl/base/optimization.h"
#include "absl/base/port.h" #include "absl/base/port.h"
#include "absl/debugging/stacktrace.h" #include "absl/debugging/stacktrace.h"
#include "absl/debugging/internal/address_is_readable.h" #include "absl/debugging/internal/address_is_readable.h"
@ -150,8 +152,9 @@ static void **NextStackFrame(void **old_sp, const void *uc) {
} }
// This ensures that absl::GetStackTrace sets up the Link Register properly. // This ensures that absl::GetStackTrace sets up the Link Register properly.
void StacktracePowerPCDummyFunction() __attribute__((noinline)); ABSL_ATTRIBUTE_NOINLINE static void AbslStacktracePowerPCDummyFunction() {
void StacktracePowerPCDummyFunction() { __asm__ volatile(""); } ABSL_BLOCK_TAIL_CALL_OPTIMIZATION();
}
template <bool IS_STACK_FRAMES, bool IS_WITH_CONTEXT> template <bool IS_STACK_FRAMES, bool IS_WITH_CONTEXT>
ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS // May read random elements from stack. ABSL_ATTRIBUTE_NO_SANITIZE_ADDRESS // May read random elements from stack.
@ -176,7 +179,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 // want here. While the compiler will always(?) set up LR for
// subroutine calls, it may not for leaf functions (such as this one). // subroutine calls, it may not for leaf functions (such as this one).
// This routine forces the compiler (at least gcc) to push it anyway. // 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. // The LR save area is used by the callee, so the top entry is bogus.
skip_count++; skip_count++;