From 80dce5a31a5c52c9c2db182938d8ef385869f92b Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 31 Oct 2005 01:28:48 +0000 Subject: [PATCH] 2005-10-26 Jakub Jelinek * 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 . --- elf/dl-conflict.c | 6 +++--- 1 file 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 , 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