am 0fa6279f: am 5b6346f6: Merge "bionic: linker: Need update the map->l_addr for execution."

* commit '0fa6279f394bb5a5cfeb7996d28b8fd2365477e7':
  bionic: linker: Need update the map->l_addr for execution.
This commit is contained in:
Elliott Hughes 2012-10-01 09:23:11 -07:00 committed by Android Git Automerger
commit 068f33981d

View File

@ -1916,6 +1916,12 @@ sanitize:
soinfo_call_constructors(preloads[i]);
}
/*After the link_image, the si->base is initialized.
*For so lib, the map->l_addr will be updated in notify_gdb_of_load.
*We need to update this value for so exe here. So Unwind_Backtrace
*for some arch like x86 could work correctly within so exe.
*/
map->l_addr = si->base;
soinfo_call_constructors(si);
#if ALLOW_SYMBOLS_FROM_MAIN