about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--NEWS3
-rw-r--r--elf/setup-vdso.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 090efd0de4..162c5d77fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2012-10-05  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14557]
+	* elf/setup-vdso.h (setup_vdso): Set GL(dl_nns) to 1 for vDSO
+	if IS_IN_rtld isn't defined.
+
 	* elf/dl-support.c (_dl_sysinfo_map): New.
 	Include "get-dynamic-info.h" and "setup-vdso.h".
 	(_dl_non_dynamic_init): Call setup_vdso.
diff --git a/NEWS b/NEWS
index bd309bad33..ce3e3604ee 100644
--- a/NEWS
+++ b/NEWS
@@ -15,7 +15,8 @@ Version 2.17
   14173, 14195, 14237, 14251, 14252, 14283, 14298, 14303, 14307, 14328,
   14331, 14336, 14337, 14347, 14349, 14376, 14417, 14459, 14476, 14477,
   14505, 14510, 14516, 14518, 14519, 14530, 14532, 14538, 14543, 14544,
-  14545, 14562, 14576, 14579, 14583, 14587, 14621, 14638, 14645, 14648.
+  14545, 14557, 14562, 14576, 14579, 14583, 14587, 14621, 14638, 14645,
+  14648.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and
diff --git a/elf/setup-vdso.h b/elf/setup-vdso.h
index 1b969a0718..f8f348a5f2 100644
--- a/elf/setup-vdso.h
+++ b/elf/setup-vdso.h
@@ -106,6 +106,8 @@ setup_vdso (struct link_map *main_map __attribute__ ((unused)),
       GL(dl_rtld_map).l_next = l;
       l->l_prev = &GL(dl_rtld_map);
       *first_preload = &l->l_next;
+# else
+      GL(dl_nns) = 1;
 # endif
 
       /* We have a prelinked DSO preloaded by the system.  */