mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
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>.
This commit is contained in:
parent
71b8b018dd
commit
80dce5a31a
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user