+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].
#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);
for (; conflict < conflictend; ++conflict)
elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset);
}
-}
#endif
+}
_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;
_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