1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
2003-04-06  Jakub Jelinek  <jakub@redhat.com>

	* elf/rtld.c: Revert 2003-03-14 change.
	* elf/dl-conflict.c (_dl_resolve_conflicts): Move
	#if ! ELF_MACHINE_NO_RELA conditional into the routine.
This commit is contained in:
Ulrich Drepper
2003-04-06 18:58:09 +00:00
parent c70ad7d71e
commit efedd9cf71
3 changed files with 8 additions and 4 deletions

View File

@ -1444,7 +1444,6 @@ cannot allocate TLS data structures for initial thread");
_dl_printf ("\nprelink checking: %s\n", prelinked ? "ok" : "failed");
}
#if ! ELF_MACHINE_NO_RELA /* We don't REL-only prelink. */
if (prelinked)
{
struct link_map *l;
@ -1477,7 +1476,6 @@ cannot allocate TLS data structures for initial thread");
_dl_sysdep_start_cleanup ();
}
else
#endif
{
/* Now we have all the objects loaded. Relocate them all except for
the dynamic linker itself. We do this in reverse order so that copy