From a1c163796444baf4362e7d5e4583e27effbffa48 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 31 Mar 2006 11:23:55 +0000 Subject: [PATCH] * ldmisc.c (vfinfo): Revert 2005-10-05 changes. If bfd_find_nearest_line succeeded for %C or %D, but filename is NULL, print section+offset at the end. --- ld/ChangeLog | 6 ++++++ ld/ldmisc.c | 21 +++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 57894bd058b..1eba0438336 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2006-03-31 Jakub Jelinek + + * ldmisc.c (vfinfo): Revert 2005-10-05 changes. If + bfd_find_nearest_line succeeded for %C or %D, but filename + is NULL, print section+offset at the end. + 2006-03-25 Bernd Schmidt * emulparams/elf32bfinfd.sh: New file. diff --git a/ld/ldmisc.c b/ld/ldmisc.c index 3ba4221e6ee..8af043aa2b2 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -1,6 +1,6 @@ /* ldmisc.c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005 + 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support. @@ -337,7 +337,7 @@ vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning) && strcmp (last_file, filename) != 0) || strcmp (last_function, functionname) != 0) { - lfinfo (fp, _("%B: In function `%T'"), + lfinfo (fp, _("%B: In function `%T':\n"), abfd, functionname); last_bfd = abfd; @@ -353,20 +353,17 @@ vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning) discard_last = FALSE; } else - lfinfo (fp, "%B", abfd); + lfinfo (fp, "%B:", abfd); if (filename != NULL) - fprintf (fp, ":%s", filename); + fprintf (fp, "%s:", filename); if (functionname != NULL && fmt[-1] == 'G') - lfinfo (fp, ":%T", functionname); - else if (filename != NULL) - { - if (linenumber != 0) - fprintf (fp, ":%u", linenumber); - else - lfinfo (fp, ":(%A+0x%v)", section, offset); - } + lfinfo (fp, "%T", functionname); + else if (filename != NULL && linenumber != 0) + fprintf (fp, "%u", linenumber); + else + lfinfo (fp, "(%A+0x%v)", section, offset); } else lfinfo (fp, "%B:(%A+0x%v)", abfd, section, offset); -- 2.30.2