X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=ld%2Fldmisc.c;h=d49cf178125b3f4a7069d81a758e5a6fa863d28d;hb=8ea5bce59057ef1906bf1180843c0900b191dcab;hp=8fe0b43f1488db9431552e651fbe395e3cf3e990;hpb=f2763b012e379b77b8927ceb967223b6ea01e6a9;p=binutils-gdb.git diff --git a/ld/ldmisc.c b/ld/ldmisc.c index 8fe0b43f148..d49cf178125 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -1,29 +1,29 @@ /* ldmisc.c Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2002, 2003, 2004 + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support. - This file is part of GLD, the Gnu Linker. + This file is part of the GNU Binutils. - GLD is free software; you can redistribute it and/or modify + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. - GLD is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with GLD; see the file COPYING. If not, write to the Free - Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, + MA 02110-1301, USA. */ +#include "sysdep.h" #include "bfd.h" #include "bfdlink.h" -#include "sysdep.h" #include "libiberty.h" #include "demangle.h" #include @@ -55,13 +55,15 @@ %W hex bfd_vma with 0x with no leading zeros taking up 8 spaces %X no object output, fail return %d integer, like printf + %ld long, like printf + %lu unsigned long, like printf %s arbitrary string, like printf %u integer, like printf %v hex bfd_vma, no leading zeros */ static void -vfinfo (FILE *fp, const char *fmt, va_list arg) +vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning) { bfd_boolean fatal = FALSE; @@ -78,10 +80,6 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) fmt++; switch (*fmt++) { - default: - fprintf (fp, "%%%c", fmt[-1]); - break; - case '%': /* literal % */ putc ('%', fp); @@ -146,17 +144,24 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) const char *name = va_arg (arg, const char *); if (name == NULL || *name == 0) - fprintf (fp, _("no symbol")); - else if (! demangling) - fprintf (fp, "%s", name); - else + { + fprintf (fp, _("no symbol")); + break; + } + else if (demangling) { char *demangled; - demangled = demangle (name); - fprintf (fp, "%s", demangled); - free (demangled); + demangled = bfd_demangle (link_info.output_bfd, name, + DMGL_ANSI | DMGL_PARAMS); + if (demangled != NULL) + { + fprintf (fp, "%s", demangled); + free (demangled); + break; + } } + fprintf (fp, "%s", name); } break; @@ -190,7 +195,7 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) bfd *abfd = va_arg (arg, bfd *); if (abfd == NULL) - fprintf (fp, ""); + fprintf (fp, "%s generated", program_name); else if (abfd->my_archive) fprintf (fp, "%s(%s)", abfd->my_archive->filename, abfd->filename); @@ -264,8 +269,7 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) bfd *abfd; asection *section; bfd_vma offset; - lang_input_statement_type *entry; - asymbol **asymbols; + asymbol **asymbols = NULL; const char *filename; const char *functionname; unsigned int linenumber; @@ -275,40 +279,39 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) section = va_arg (arg, asection *); offset = va_arg (arg, bfd_vma); - entry = (lang_input_statement_type *) abfd->usrdata; - if (entry != (lang_input_statement_type *) NULL - && entry->asymbols != (asymbol **) NULL) - asymbols = entry->asymbols; - else + if (abfd != NULL) { - long symsize; - long symbol_count; - - symsize = bfd_get_symtab_upper_bound (abfd); - if (symsize < 0) - einfo (_("%B%F: could not read symbols\n"), abfd); - asymbols = xmalloc (symsize); - symbol_count = bfd_canonicalize_symtab (abfd, asymbols); - if (symbol_count < 0) - einfo (_("%B%F: could not read symbols\n"), abfd); - if (entry != (lang_input_statement_type *) NULL) - { - entry->asymbols = asymbols; - entry->symbol_count = symbol_count; - } + if (!bfd_generic_link_read_symbols (abfd)) + einfo (_("%B%F: could not read symbols: %E\n"), abfd); + + asymbols = bfd_get_outsymbols (abfd); } - lfinfo (fp, "%B(%A+0x%v)", abfd, section, offset); + /* The GNU Coding Standard requires that error messages + be of the form: + + source-file-name:lineno: message + We do not always have a line number available so if + we cannot find them we print out the section name and + offset instread. */ discard_last = TRUE; - if (bfd_find_nearest_line (abfd, section, asymbols, offset, - &filename, &functionname, - &linenumber)) + if (abfd != NULL + && bfd_find_nearest_line (abfd, section, asymbols, offset, + &filename, &functionname, + &linenumber)) { - bfd_boolean need_colon = TRUE; - if (functionname != NULL && fmt[-1] == 'C') { + /* Detect the case where we are printing out a + message for the same function as the last + call to vinfo ("%C"). In this situation do + not print out the ABFD filename or the + function name again. Note - we do still + print out the source filename, as this will + allow programs that parse the linker's output + (eg emacs) to correctly locate multiple + errors in the same source file. */ if (last_bfd == NULL || last_file == NULL || last_function == NULL @@ -317,9 +320,8 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) && strcmp (last_file, filename) != 0) || strcmp (last_function, functionname) != 0) { - lfinfo (fp, _(": In function `%T':\n"), - functionname); - need_colon = FALSE; + lfinfo (fp, _("%B: In function `%T':\n"), + abfd, functionname); last_bfd = abfd; if (last_file != NULL) @@ -333,22 +335,21 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) } discard_last = FALSE; } + else + lfinfo (fp, "%B:", abfd); if (filename != NULL) - { - if (need_colon) - putc (':', fp); - fputs (filename, fp); - } + fprintf (fp, "%s:", filename); if (functionname != NULL && fmt[-1] == 'G') - lfinfo (fp, ":%T", functionname); + lfinfo (fp, "%T", functionname); else if (filename != NULL && linenumber != 0) - fprintf (fp, ":%u", linenumber); + fprintf (fp, "%u", linenumber); + else + lfinfo (fp, "(%A+0x%v)", section, offset); } - - if (asymbols != NULL && entry == NULL) - free (asymbols); + else + lfinfo (fp, "%B:(%A+0x%v)", abfd, section, offset); if (discard_last) { @@ -381,59 +382,36 @@ vfinfo (FILE *fp, const char *fmt, va_list arg) /* unsigned integer, like printf */ fprintf (fp, "%u", va_arg (arg, unsigned int)); break; + + case 'l': + if (*fmt == 'd') + { + fprintf (fp, "%ld", va_arg (arg, long)); + ++fmt; + break; + } + else if (*fmt == 'u') + { + fprintf (fp, "%lu", va_arg (arg, unsigned long)); + ++fmt; + break; + } + /* Fall thru */ + + default: + fprintf (fp, "%%%c", fmt[-1]); + break; } } } - if (config.fatal_warnings) + if (is_warning && config.fatal_warnings) config.make_executable = FALSE; if (fatal) xexit (1); } -/* Wrapper around cplus_demangle. Strips leading underscores and - other such chars that would otherwise confuse the demangler. */ - -char * -demangle (const char *name) -{ - char *res; - const char *p; - - if (output_bfd != NULL - && bfd_get_symbol_leading_char (output_bfd) == name[0]) - ++name; - - /* This is a hack for better error reporting on XCOFF, PowerPC64-ELF - or the MS PE format. These formats have a number of leading '.'s - on at least some symbols, so we remove all dots to avoid - confusing the demangler. */ - p = name; - while (*p == '.') - ++p; - - res = cplus_demangle (p, DMGL_ANSI | DMGL_PARAMS); - if (res) - { - size_t dots = p - name; - - /* Now put back any stripped dots. */ - if (dots != 0) - { - size_t len = strlen (res) + 1; - char *add_dots = xmalloc (len + dots); - - memcpy (add_dots, name, dots); - memcpy (add_dots + dots, res, len); - free (res); - res = add_dots; - } - return res; - } - return xstrdup (name); -} - /* Format info message and print on stdout. */ /* (You would think this should be called just "info", but then you @@ -445,7 +423,7 @@ info_msg (const char *fmt, ...) va_list arg; va_start (arg, fmt); - vfinfo (stdout, fmt, arg); + vfinfo (stdout, fmt, arg, FALSE); va_end (arg); } @@ -457,7 +435,7 @@ einfo (const char *fmt, ...) va_list arg; va_start (arg, fmt); - vfinfo (stderr, fmt, arg); + vfinfo (stderr, fmt, arg, TRUE); va_end (arg); } @@ -472,11 +450,14 @@ info_assert (const char *file, unsigned int line) void minfo (const char *fmt, ...) { - va_list arg; + if (config.map_file != NULL) + { + va_list arg; - va_start (arg, fmt); - vfinfo (config.map_file, fmt, arg); - va_end (arg); + va_start (arg, fmt); + vfinfo (config.map_file, fmt, arg, FALSE); + va_end (arg); + } } void @@ -485,7 +466,7 @@ lfinfo (FILE *file, const char *fmt, ...) va_list arg; va_start (arg, fmt); - vfinfo (file, fmt, arg); + vfinfo (file, fmt, arg, FALSE); va_end (arg); }