am b61eeafa: am bce693eb: am 97e0c1dd: Merge "Fix debugging issues in vdso handling"

* commit 'b61eeafac8d734fbb86e0f058bce4fe4a5051354':
  Fix debugging issues in vdso handling
This commit is contained in:
Elliott Hughes 2013-12-12 19:32:19 +00:00 committed by Android Git Automerger
commit bc597d71f8

View File

@ -1750,6 +1750,9 @@ static bool soinfo_link_image(soinfo* si) {
static void add_vdso(KernelArgumentBlock& args UNUSED) {
#if defined(AT_SYSINFO_EHDR)
Elf_Ehdr* ehdr_vdso = reinterpret_cast<Elf_Ehdr*>(args.getauxval(AT_SYSINFO_EHDR));
if (ehdr_vdso == NULL) {
return;
}
soinfo* si = soinfo_alloc("[vdso]");
@ -1761,7 +1764,6 @@ static void add_vdso(KernelArgumentBlock& args UNUSED) {
si->load_bias = get_elf_exec_load_bias(ehdr_vdso);
soinfo_link_image(si);
insert_soinfo_into_debug_map(si);
#endif
}