diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-04-06 18:58:09 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-04-06 18:58:09 +0000 |
| commit | efedd9cf71dd21618635d5f52717a713505ad5d7 (patch) | |
| tree | 6d89a517a2b42a79e3c0e47a3eac0f408aac8c7d /elf/dl-conflict.c | |
| parent | c70ad7d71e248cade1345ce53a4229a43edbc932 (diff) | |
| download | glibc-efedd9cf71dd21618635d5f52717a713505ad5d7.zip glibc-efedd9cf71dd21618635d5f52717a713505ad5d7.tar.gz glibc-efedd9cf71dd21618635d5f52717a713505ad5d7.tar.bz2 | |
Update.
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.
Diffstat (limited to 'elf/dl-conflict.c')
| -rw-r--r-- | elf/dl-conflict.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index fc38d45..0068cd8 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 +} |