about summary refs log tree commit diff
path: root/elf/dl-reloc.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-06-08 09:00:23 +0000
committerRoland McGrath <roland@gnu.org>1995-06-08 09:00:23 +0000
commit5bf62f2d3a8af353fac661b224fc1604d4de51ea (patch)
treed71b6ad14564a99917f2d4133a8685df94d24c61 /elf/dl-reloc.c
parent75598ca67e469359c3c0b6b8704dae17bf2b9d89 (diff)
downloadglibc-5bf62f2d3a8af353fac661b224fc1604d4de51ea.tar.gz
glibc-5bf62f2d3a8af353fac661b224fc1604d4de51ea.tar.xz
glibc-5bf62f2d3a8af353fac661b224fc1604d4de51ea.zip
Thu Jun 8 02:50:26 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
	* elf/rtld.c [! NDEBUG] (__assert_perror_fail): New function.

	* hurd/hurdstartup.c (_hurd_startup): Fancier kludge to guess phdr
 	and user entry point addresses.

	* elf/dl-load.c (open_path): Don't do strlen on DIRPATH if it's null.
	(_dl_map_object): DT_RPATH value is relative to DT_STRTAB value.

	* Makerules (install-lib.so): Don't include libc.so.
	[$(build-shared)=yes] (install): Depend on the installed libc.so file.
	[$(build-shared)=yes] (install-no-libc.a): Make this, rather than
	install, depend on the installed $(install-lib.so) files.
	[$(build-shared)=yes] (install-lib.so): Append libc.so after that rule.

	* sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Add kludge to
 	allocate high addresses to avoid random mappings appearing there.
	(mmap): Comment out mask; always pass zero.

Tue Jun  6 13:34:53 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* sysdeps/i386/dl-machine.h (ELF_MACHINE_USER_ADDRESS_MASK): New macro.
	* sysdeps/mach/hurd/dl-sysdep.c (mmap): Use it as mask in vm_map call.

	* elf/dl-error.c (_dl_catch_error): Clear *ERRSTRING and *OBJNAME
 	when successful.

	* sysdeps/mach/hurd/dl-sysdep.c (threadvars): New static variable.
	(__hurd_threadvar_max, __hurd_threadvar_stack_offset): Define these
	variables, using the `threadvars' buffer.

	* elf/dl-reloc.c: Don't dereference L->l_prev when it's null.
	* sysdeps/i386/dl-runtime.c: Likewise.

	* elf/rtld.c (dl_main): Add missing NULL terminating argument in
 	_dl_sysdep_fatal call.
	(__assert_fail): Likewise.

	* locale/Makefile (localedef-modules): Renamed ctype to
 	locale-ctype so as not to conflict with the object file for
 	ctype/ctype.c in the build directory.

	* sysdeps/i386/dl-machine.h (elf_machine_rel): If MAP->l_type is
 	lt_interpreter, first undo relocation done during bootstrapping.
Diffstat (limited to 'elf/dl-reloc.c')
-rw-r--r--elf/dl-reloc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index a3590ff749..7cbed389b8 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -69,7 +69,8 @@ _dl_relocate_object (struct link_map *l, int lazy)
     real_next = l->l_next;
     if (l->l_info[DT_SYMBOLIC])
       {
-	l->l_prev->l_next = real_next;
+	if (l->l_prev)
+	  l->l_prev->l_next = real_next;
 	l->l_next = _dl_loaded;
 	scope = l;
       }
@@ -88,7 +89,8 @@ _dl_relocate_object (struct link_map *l, int lazy)
 
     /* Restore list frobnication done above for DT_SYMBOLIC.  */
     l->l_next = real_next;
-    l->l_prev->l_next = l;
+    if (l->l_prev)
+      l->l_prev->l_next = l;
   }
 
   if (l->l_info[DT_JMPREL] && lazy)