public inbox for libc-hacker@sourceware.org
 help / color / mirror / Atom feed
* [PATCH] Fix LD_DEBUG=all LD_DEBUG_OUTPUT=something
@ 2005-10-26 18:53 Jakub Jelinek
  2005-10-31  1:29 ` Roland McGrath
  0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2005-10-26 18:53 UTC (permalink / raw)
  To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers

Hi!

Apparently
conflict processing: XXXX
debug message is the only one printed to stdout with
LD_DEBUG=all LD_DEBUG_OUTPUT=somefile

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>.

--- libc/elf/dl-conflict.c.jj	2004-10-15 23:08:33.000000000 +0200
+++ libc/elf/dl-conflict.c	2005-10-26 20:49:32.000000000 +0200
@@ -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 *
 {
 #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

	Jakub

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] Fix LD_DEBUG=all LD_DEBUG_OUTPUT=something
  2005-10-26 18:53 [PATCH] Fix LD_DEBUG=all LD_DEBUG_OUTPUT=something Jakub Jelinek
@ 2005-10-31  1:29 ` Roland McGrath
  0 siblings, 0 replies; 2+ messages in thread
From: Roland McGrath @ 2005-10-31  1:29 UTC (permalink / raw)
  To: Jakub Jelinek; +Cc: Glibc hackers

> 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>.

Applied.


Thanks,
Roland

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-10-31  1:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-10-26 18:53 [PATCH] Fix LD_DEBUG=all LD_DEBUG_OUTPUT=something Jakub Jelinek
2005-10-31  1:29 ` Roland McGrath

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).