about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--elf/rtld.c2
-rw-r--r--linuxthreads/ChangeLog4
3 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 09403842b9..755a15277e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-10-01  Roland McGrath  <roland@redhat.com>
+
+	* elf/rtld.c (dl_main): Add cast in last change.
+
 2003-09-10  Chris Demetriou  <cgd@broadcom.com>
 
 	* sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h: Remove
diff --git a/elf/rtld.c b/elf/rtld.c
index 69238399b5..4291f18993 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1173,7 +1173,7 @@ of this helper program; chances are you did not intend to run this program.\n\
 	  elf_get_dynamic_info (l, dyn_temp);
 	  _dl_setup_hash (l);
 	  l->l_relocated = 1;
-	  l->l_map_start = GL(dl_sysinfo_dso);
+	  l->l_map_start = (ElfW(Addr)) GL(dl_sysinfo_dso);
 
 	  /* Now that we have the info handy, use the DSO image's soname
 	     so this object can be looked up by name.  */
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 27e479deeb..22e930554e 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-10  Chris Demetriou  <cgd@broadcom.com>
+
+	* sysdeps/unix/sysv/linux/mips/mips64/sysdep-cancel.h: New file.
+
 2003-09-30  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/pthread/malloc-machine.h [!__libc_maybe_call2] (mutex_init,