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.

diff --git a/ChangeLog b/ChangeLog
index 3c9c959fd1b02c17ad80f33e66b715e9484832f4..3d41441f0b4aa6b9a9b9b3c1f29312e0c20ce006 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2004-02-27  Jakub Jelinek  <jakub@redhat.com>
 
+       * 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.
+
        * sysdeps/unix/sysv/linux/sysconf.c: Include stdlib.h.
 
 2004-02-26  Ulrich Drepper  <drepper@redhat.com>

diff --git a/elf/rtld.c b/elf/rtld.c
index a6910e516184c6047adddaa7fc2f5ffe3de37860..87a86bed3241ef64f5d6556e6185c0a0e640c8fe 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1246,6 +1246,7 @@ ERROR: ld.so: object '%s' from %s cannot be preloaded: ignored.\n",
          l->l_map_start = (ElfW(Addr)) GL(dl_sysinfo_dso);
          l->l_addr = l->l_map_start - l->l_addr;
          l->l_map_end += l->l_addr;
+         l->l_ld = (void *) ((ElfW(Addr)) l->l_ld + l->l_addr);
          elf_get_dynamic_info (l, dyn_temp);
          _dl_setup_hash (l);
          l->l_relocated = 1;

diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index b95c02d92f5242a45cd9a027eefc58a40432fc37..bdd7326c58c10bfd38f9f12c34fe8be5a547bf9e 100644 (file)
--- 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