diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/dl-conflict.c | 4 | ||||
| -rw-r--r-- | elf/rtld.c | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index d6371540d0..b5016ceab6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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. + 2003-04-05 Ulrich Drepper <drepper@redhat.com> * sunrpc/xdr.c (xdr_string): Catch nodesize == 0 [PR libc/4999]. diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index fc38d459d5..0068cd885a 100644 --- a/elf/dl-conflict.c +++ b/elf/dl-conflict.c @@ -28,11 +28,11 @@ #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) { +#if ! ELF_MACHINE_NO_RELA if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_RELOC, 0)) _dl_printf ("\nconflict processing: %s\n", l->l_name[0] ? l->l_name : rtld_progname); @@ -64,5 +64,5 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, for (; conflict < conflictend; ++conflict) elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset); } -} #endif +} 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 |