mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 10:50:07 +00:00
Fix NEED_DL_SYSINFO{,_DSO} conditionalization in _dl_sysdep_start.
This commit is contained in:
parent
83e7640f6b
commit
60bfd54cbb
@ -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.
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user