am 8784709a: Merge "We should use load_bias. This patch fixes MIPS NDK device exception test failures."

* commit '8784709a2cfe6d32b5fff2c6b826b8d9cbf73d7b':
  We should use load_bias.  This patch fixes MIPS NDK device exception test failures.
This commit is contained in:
Nick Kralevich 2012-11-19 11:08:49 -08:00 committed by Android Git Automerger
commit c16ea16134

View File

@ -1928,12 +1928,12 @@ static unsigned __linker_init_post_relocation(unsigned **elfdata, unsigned linke
preloads[i]->CallConstructors();
}
/*After the link_image, the si->base is initialized.
/*After the link_image, the si->load_bias 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;
map->l_addr = si->load_bias;
si->CallConstructors();
#if TIMING