summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-21 10:15:14 -0700
committerElliott Hughes <enh@google.com>2014-04-21 10:15:14 -0700
commitd3679c815e010c2e67bf07420b6ab3a74f27a2ed (patch)
tree7105ac89172be5ad7396be69471233a7f034e7fe
parent8abf44c415bb3b02b6a3198196c92266442a0c32 (diff)
downloadbionic-d3679c815e010c2e67bf07420b6ab3a74f27a2ed.zip
bionic-d3679c815e010c2e67bf07420b6ab3a74f27a2ed.tar.gz
bionic-d3679c815e010c2e67bf07420b6ab3a74f27a2ed.tar.bz2
clang is >= 3.4 now; remove a hack.
Change-Id: I8d976ee0fd88eca9779c87b5d7e27f46b4b1b489
-rw-r--r--libc/bionic/debug_stacktrace.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/libc/bionic/debug_stacktrace.cpp b/libc/bionic/debug_stacktrace.cpp
index 83171ad..4207a3f 100644
--- a/libc/bionic/debug_stacktrace.cpp
+++ b/libc/bionic/debug_stacktrace.cpp
@@ -87,18 +87,6 @@ struct stack_crawl_state_t {
}
};
-#if defined(__arm__) && !defined(_Unwind_GetIP)
-// Older versions of Clang don't provide a definition of _Unwind_GetIP(), so
-// we include an appropriate version of our own. Once we have updated to
-// Clang 3.4, this code can be removed.
-static __inline__
-uintptr_t _Unwind_GetIP(struct _Unwind_Context *__context) {
- uintptr_t __ip = 0;
- _Unwind_VRS_Get(__context, _UVRSC_CORE, 15, _UVRSD_UINT32, &__ip);
- return __ip & ~0x1;
-}
-#endif
-
static _Unwind_Reason_Code trace_function(__unwind_context* context, void* arg) {
stack_crawl_state_t* state = static_cast<stack_crawl_state_t*>(arg);