about summary refs log tree commit diff
path: root/elf/rtld.c
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2003-03-14 05:34:36 +0000
committerAlexandre Oliva <aoliva@redhat.com>2003-03-14 05:34:36 +0000
commita77dcecfd4d0083b25b3fdcd4f033143ab6d4397 (patch)
tree8b5df7accbfb9ef078cef1aab2a3134fe35b43e1 /elf/rtld.c
parentb5bac573e6adefab9fb3f693a42434b77ed5a0da (diff)
downloadglibc-a77dcecfd4d0083b25b3fdcd4f033143ab6d4397.tar.gz
glibc-a77dcecfd4d0083b25b3fdcd4f033143ab6d4397.tar.xz
glibc-a77dcecfd4d0083b25b3fdcd4f033143ab6d4397.zip
* 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.
Diffstat (limited to 'elf/rtld.c')
-rw-r--r--elf/rtld.c2
1 files changed, 2 insertions, 0 deletions
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