From a77dcecfd4d0083b25b3fdcd4f033143ab6d4397 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Fri, 14 Mar 2003 05:34:36 +0000 Subject: * elf/dl-conflict.c: Don't compile _dl_resolve_conflicts if ELF_MACHINE_NO_RELA is set. * elf/rtld.c (dl_main): No prelink support for REL-only. * elf/dl-conflict.c: Don't compile _dl_resolve_conflicts if ELF_MACHINE_NO_RELA is set. * elf/rtld.c (dl_main): No prelink support for REL-only. --- elf/rtld.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'elf/rtld.c') diff --git a/elf/rtld.c b/elf/rtld.c index bd66149dd1..7e26fc26ca 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1444,6 +1444,7 @@ 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; @@ -1476,6 +1477,7 @@ 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 1.4.1