diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2003-03-14 05:34:36 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2003-03-14 05:34:36 +0000 |
| commit | a77dcecfd4d0083b25b3fdcd4f033143ab6d4397 (patch) | |
| tree | 8b5df7accbfb9ef078cef1aab2a3134fe35b43e1 /elf | |
| parent | b5bac573e6adefab9fb3f693a42434b77ed5a0da (diff) | |
| download | glibc-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')
| -rw-r--r-- | elf/dl-conflict.c | 5 | ||||
| -rw-r--r-- | elf/rtld.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index ae091abd27..fc38d459d5 100644 --- a/elf/dl-conflict.c +++ b/elf/dl-conflict.c @@ -1,5 +1,5 @@ /* Resolve conflicts against already prelinked libraries. - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. @@ -28,7 +28,7 @@ #include <sys/types.h> #include "dynamic-link.h" - +#if ! ELF_MACHINE_NO_RELA void _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, ElfW(Rela) *conflictend) @@ -65,3 +65,4 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset); } } +#endif 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 |