am c692d3e5: am db314648: Merge "Add support for DT_MIPS_RLD_MAP2 tag."

* commit 'c692d3e50a3af788e9294769fca33e29eb91b139':
  Add support for DT_MIPS_RLD_MAP2 tag.
This commit is contained in:
Dimitry Ivanov 2014-12-19 21:26:04 +00:00 committed by Android Git Automerger
commit 7544631ef6
2 changed files with 8 additions and 0 deletions

View File

@ -121,6 +121,7 @@
#define DT_MIPS_GOTSYM 0x70000013 /* first dynamic sym in got */
#define DT_MIPS_HIPAGENO 0x70000014
#define DT_MIPS_RLD_MAP 0x70000016 /* address of loader map */
#define DT_MIPS_RLD_MAP2 0x70000035 /* offset of loader map, used for PIE */
/*
* ELF Flags

View File

@ -2402,6 +2402,13 @@ bool soinfo::prelink_image() {
*dp = &_r_debug;
}
break;
case DT_MIPS_RLD_MAP2:
// Set the DT_MIPS_RLD_MAP2 entry to the address of _r_debug for GDB.
{
r_debug** dp = reinterpret_cast<r_debug**>(reinterpret_cast<ElfW(Addr)>(d) + d->d_un.d_val);
*dp = &_r_debug;
}
break;
case DT_MIPS_RLD_VERSION:
case DT_MIPS_FLAGS: