From d3679c815e010c2e67bf07420b6ab3a74f27a2ed Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 21 Apr 2014 10:15:14 -0700 Subject: [PATCH] clang is >= 3.4 now; remove a hack. Change-Id: I8d976ee0fd88eca9779c87b5d7e27f46b4b1b489 --- libc/bionic/debug_stacktrace.cpp | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/libc/bionic/debug_stacktrace.cpp b/libc/bionic/debug_stacktrace.cpp index 83171add9..4207a3fd5 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(arg);