summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-01-25 15:39:33 -0800
committerElliott Hughes <enh@google.com>2013-01-25 15:39:33 -0800
commit46d079dd8c974cb28d52b052158c2843d4125756 (patch)
tree41953e6dce0ce5a2b645f85097bed62177f10f2e
parent61ae5dfda0ddf74b5f05446aa1f76f3aa1917202 (diff)
downloadsystem_core-46d079dd8c974cb28d52b052158c2843d4125756.zip
system_core-46d079dd8c974cb28d52b052158c2843d4125756.tar.gz
system_core-46d079dd8c974cb28d52b052158c2843d4125756.tar.bz2
libcorkscrew will always HAVE_DLADDR.
The only place we don't have dladdr(3) is Windows, and libcorkscrew is for Unix. Change-Id: If7633ee8398bccf9897add728facbe07592c0fcf
-rw-r--r--libcorkscrew/backtrace.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/libcorkscrew/backtrace.c b/libcorkscrew/backtrace.c
index 3697d18..03dbd53 100644
--- a/libcorkscrew/backtrace.c
+++ b/libcorkscrew/backtrace.c
@@ -35,10 +35,8 @@
#include <cutils/atomic.h>
#include <elf.h>
-#if HAVE_DLADDR
#define __USE_GNU // For dladdr(3) in glibc.
#include <dlfcn.h>
-#endif
#if defined(__BIONIC__)
@@ -256,7 +254,6 @@ void get_backtrace_symbols(const backtrace_frame_t* backtrace, size_t frames,
if (mi->name[0]) {
symbol->map_name = strdup(mi->name);
}
-#if HAVE_DLADDR
Dl_info info;
if (dladdr((const void*)frame->absolute_pc, &info) && info.dli_sname) {
symbol->relative_symbol_addr = (uintptr_t)info.dli_saddr
@@ -264,7 +261,6 @@ void get_backtrace_symbols(const backtrace_frame_t* backtrace, size_t frames,
symbol->symbol_name = strdup(info.dli_sname);
symbol->demangled_name = demangle_symbol_name(symbol->symbol_name);
}
-#endif
}
}
release_my_map_info_list(milist);