From efedd9cf71dd21618635d5f52717a713505ad5d7 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 6 Apr 2003 18:58:09 +0000 Subject: Update. 2003-04-06 Jakub Jelinek * 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. --- elf/rtld.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'elf/rtld.c') diff --git a/elf/rtld.c b/elf/rtld.c index 7e26fc26ca..bd66149dd1 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -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 -- cgit v1.2.3