aboutsummaryrefslogtreecommitdiff
path: root/elf/rtld.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-04-06 18:58:09 +0000
committerUlrich Drepper <drepper@redhat.com>2003-04-06 18:58:09 +0000
commitefedd9cf71dd21618635d5f52717a713505ad5d7 (patch)
tree6d89a517a2b42a79e3c0e47a3eac0f408aac8c7d /elf/rtld.c
parentc70ad7d71e248cade1345ce53a4229a43edbc932 (diff)
downloadglibc-efedd9cf71dd21618635d5f52717a713505ad5d7.tar
glibc-efedd9cf71dd21618635d5f52717a713505ad5d7.tar.gz
glibc-efedd9cf71dd21618635d5f52717a713505ad5d7.tar.bz2
glibc-efedd9cf71dd21618635d5f52717a713505ad5d7.zip
Update.
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.
Diffstat (limited to 'elf/rtld.c')
-rw-r--r--elf/rtld.c2
1 files changed, 0 insertions, 2 deletions
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