aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-05-03 15:09:48 -0700
committerRoland McGrath <roland@hack.frob.com>2013-05-03 15:09:48 -0700
commit60bfd54cbb0c51ab95c52a7438509373b848c957 (patch)
tree1df3c55f6cf327f92277604307cb027802881dc9
parent83e7640f6bf68708ecf0b09d83c670203167271e (diff)
downloadglibc-60bfd54cbb0c51ab95c52a7438509373b848c957.zip
glibc-60bfd54cbb0c51ab95c52a7438509373b848c957.tar.gz
glibc-60bfd54cbb0c51ab95c52a7438509373b848c957.tar.bz2
Fix NEED_DL_SYSINFO{,_DSO} conditionalization in _dl_sysdep_start.
-rw-r--r--ChangeLog7
-rw-r--r--elf/dl-sysdep.c13
2 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8bfb552..9d0eeb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-03 Roland McGrath <roland@hack.frob.com>
+
+ * elf/dl-sysdep.c (_dl_sysdep_start) [NEED_DL_SYSINFO]:
+ Separately conditionalize setting of GLRO(dl_sysinfo) so
+ that the GLRO(dl_sysinfo_dso) test is under [NEED_DL_SYSINFO_DSO]
+ as well, but the actual setting is only under [NEED_DL_SYSINFO].
+
2013-04-30 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/unix/sysv/linux/powerpc/Versions: Add __vdso_time symbol.
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
index d8f3dd2..52de23f 100644
--- a/elf/dl-sysdep.c
+++ b/elf/dl-sysdep.c
@@ -205,10 +205,15 @@ _dl_sysdep_start (void **start_argptr,
GLRO(dl_pagesize) = __getpagesize ();
#endif
-#if defined NEED_DL_SYSINFO
- /* Only set the sysinfo value if we also have the vsyscall DSO. */
- if (GLRO(dl_sysinfo_dso) != 0 && new_sysinfo)
- GLRO(dl_sysinfo) = new_sysinfo;
+#ifdef NEED_DL_SYSINFO
+ if (new_sysinfo != 0)
+ {
+# ifdef NEED_DL_SYSINFO_DSO
+ /* Only set the sysinfo value if we also have the vsyscall DSO. */
+ if (GLRO(dl_sysinfo_dso) != 0)
+# endif
+ GLRO(dl_sysinfo) = new_sysinfo;
+ }
#endif
#ifdef DL_SYSDEP_INIT