am fbaddda9: Merge "Linker writes to wrong memory location when processing DT_MIPS_RLD_MAP"

* commit 'fbaddda9f04fa504deb752bba819eb1fa5439baa':
  Linker writes to wrong memory location when processing DT_MIPS_RLD_MAP
This commit is contained in:
Elliott Hughes 2014-02-19 23:45:49 +00:00 committed by Android Git Automerger
commit 42049f4b9c

View File

@ -1744,7 +1744,7 @@ static bool soinfo_link_image(soinfo* si) {
case DT_MIPS_RLD_MAP: case DT_MIPS_RLD_MAP:
// Set the DT_MIPS_RLD_MAP entry to the address of _r_debug for GDB. // Set the DT_MIPS_RLD_MAP entry to the address of _r_debug for GDB.
{ {
r_debug** dp = reinterpret_cast<r_debug**>(d->d_un.d_ptr); r_debug** dp = reinterpret_cast<r_debug**>(base + d->d_un.d_ptr);
*dp = &_r_debug; *dp = &_r_debug;
} }
break; break;