diff options
| author | Roland McGrath <roland@gnu.org> | 2005-10-31 01:28:48 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2005-10-31 01:28:48 +0000 |
| commit | 80dce5a31a5c52c9c2db182938d8ef385869f92b (patch) | |
| tree | 1e4d548f830d762e1f769d2f8707d58dba6955ce /elf/dl-conflict.c | |
| parent | 71b8b018ddb05c9f4a31d728c75019772bf79344 (diff) | |
| download | glibc-80dce5a31a5c52c9c2db182938d8ef385869f92b.tar glibc-80dce5a31a5c52c9c2db182938d8ef385869f92b.tar.gz glibc-80dce5a31a5c52c9c2db182938d8ef385869f92b.tar.bz2 glibc-80dce5a31a5c52c9c2db182938d8ef385869f92b.zip | |
2005-10-26 Jakub Jelinek <jakub@redhat.com>
* elf/dl-conflict.c (_dl_resolve_conflicts): Use _dl_debug_printf
instead of _dl_printf to print conflict processing debug message.
Reported by John Reiser <jreiser@BitWagon.com>.
Diffstat (limited to 'elf/dl-conflict.c')
| -rw-r--r-- | elf/dl-conflict.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index 4ced40f75e..9b49e77d28 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, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. @@ -34,8 +34,8 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, { #if ! ELF_MACHINE_NO_RELA if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_RELOC, 0)) - _dl_printf ("\nconflict processing: %s\n", - l->l_name[0] ? l->l_name : rtld_progname); + _dl_debug_printf ("\nconflict processing: %s\n", + l->l_name[0] ? l->l_name : rtld_progname); { /* Do the conflict relocation of the object and library GOT and other |