This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[COMMITTED PATCH] Fix NEED_DL_SYSINFO{,_DSO} conditionalization in _dl_sysdep_start.
- From: Roland McGrath <roland at hack dot frob dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Fri, 3 May 2013 15:14:33 -0700 (PDT)
- Subject: [COMMITTED PATCH] Fix NEED_DL_SYSINFO{,_DSO} conditionalization in _dl_sysdep_start.
Verified on i686-linux-gnu that compiled code changes are small and harmless.
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].
--- 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