commit 5aad083f3de0bbcc0ffb1fecb688fbbe5abe5214
author Elliott Hughes <enh@google.com> Thu Dec 12 20:51:50 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 12 20:51:50 2013 +0000
tree 6e305877c898cfb3a847e689a7de0af6ce298d48
parent 97e0c1dd5a7c5517c19770e47672e216a8b64c66
parent 1887621de8a48eece8a05f2400ddd783b9833147

Merge "PTHREAD_KEYS_MAX cleanup."

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index fe4d6c4..6ebba8e 100755
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1750,6 +1750,9 @@
 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 @@
     si->load_bias = get_elf_exec_load_bias(ehdr_vdso);
 
     soinfo_link_image(si);
-    insert_soinfo_into_debug_map(si);
 #endif
 }