am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'b94b038df58cb13ae2073a28d5264bf9162d5be5':
  libcorkscrew will always HAVE_DLADDR.
This commit is contained in:
Elliott Hughes 2013-01-29 10:27:36 -08:00 committed by Android Git Automerger
commit db9697b3b0
1 changed files with 0 additions and 4 deletions

View File

@ -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);