am c3233178: am 00f33977: am 3307bff0: Merge "Revert dl_fbase initialization to the address where the shared object is loaded."

* commit 'c32331781097b51a46c03b002cd813752677236a':
  Revert dl_fbase initialization to the address where the shared object is loaded.
This commit is contained in:
Elliott Hughes 2012-09-26 10:46:39 -07:00 committed by Android Git Automerger
commit 2fb6457efb

View file

@ -138,7 +138,8 @@ int dladdr(const void *addr, Dl_info *info)
memset(info, 0, sizeof(Dl_info));
info->dli_fname = si->name;
info->dli_fbase = (void*)si->load_bias;
/* Address at which the shared object is loaded */
info->dli_fbase = (void*)si->base;
/* Determine if any symbol in the library contains the specified address */
Elf32_Sym *sym = soinfo_find_symbol(si, addr);