Merge "Fix debugging issues in vdso handling"

2013-12-12 19:19:22 +00:00
parent 38fcbbb35a 5407eed84b
commit 97e0c1dd5a
1 changed files with 3 additions and 1 deletions
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -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
 }