summary refs log tree commit diff
path: root/sysdeps/generic
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-02-28 17:56:22 +0000
committerUlrich Drepper <drepper@redhat.com>2004-02-28 17:56:22 +0000
commit49ad572a70b8aeb91e57483a11dd1b77e31c4468 (patch)
tree321e8f8c36e40206125e136031ad0f5ecdeb6431 /sysdeps/generic
parent4c771a3b260116c59e606a6ebd68702072836481 (diff)
downloadglibc-49ad572a70b8aeb91e57483a11dd1b77e31c4468.tar.gz
glibc-49ad572a70b8aeb91e57483a11dd1b77e31c4468.tar.xz
glibc-49ad572a70b8aeb91e57483a11dd1b77e31c4468.zip
Update.
	* elf/rtld.c (dl_main): Adjust l->l_ld of the vDSO by l->l_addr.
	* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Only set
	GL(dl_sysinfo) if non-zero.
Diffstat (limited to 'sysdeps/generic')
-rw-r--r--sysdeps/generic/dl-sysdep.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index b95c02d92f..bdd7326c58 100644
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -201,7 +201,7 @@ _dl_sysdep_start (void **start_argptr,
 
 #if defined NEED_DL_SYSINFO
   /* Only set the sysinfo value if we also have the vsyscall DSO.  */
-  if (GL(dl_sysinfo_dso) != 0)
+  if (GL(dl_sysinfo_dso) != 0 && new_sysinfo)
     GL(dl_sysinfo) = new_sysinfo;
 #endif