Fix NEED_DL_SYSINFO{,_DSO} conditionalization in _dl_sysdep_start.

diff --git a/ChangeLog b/ChangeLog
index 8bfb5521cc623d54af9ebca768dc48e1651e9b9c..9d0eeb76f3cee4fca9b43a20f15735543b5434da 100644 (file)
--- 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 d8f3dd2fb9f80de26fdc17c3e375bf4ad6917991..52de23f44b1bd37938cbb078f23eaa000a591892 100644 (file)
--- 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