generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix debugging issues in vdso handling"

Browse Source
This commit is contained in:
Elliott Hughes 2013-12-12 19:19:22 +00:00 committed by Gerrit Code Review
commit 97e0c1dd5a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linker/linker.cpp
View File

@ -1750,6 +1750,9 @@ static bool soinfo_link_image(soinfo* si) {
static void add_vdso(KernelArgumentBlock& args UNUSED) { static void add_vdso(KernelArgumentBlock& args UNUSED) {
#if defined(AT_SYSINFO_EHDR) #if defined(AT_SYSINFO_EHDR)
Elf_Ehdr* ehdr_vdso = reinterpret_cast<Elf_Ehdr*>(args.getauxval(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]"); 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); si->load_bias = get_elf_exec_load_bias(ehdr_vdso);
soinfo_link_image(si); soinfo_link_image(si);
insert_soinfo_into_debug_map(si);
#endif #endif
} }