X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Fldmisc.c;h=292fc45ccdda56e43887fed7ffb6f18f46fb9a9d;hb=91a5743d016cd12f0128645a278f0b3980252f82;hp=a27cf1166d3be1d43b902b59d5293cbdc7ac3415;hpb=7ce691aec4ef1b3ee705799d7166bc949815440c;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldmisc.c b/ld/ldmisc.c index a27cf1166d..292fc45ccd 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -1,98 +1,71 @@ /* ldmisc.c - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005, 2006, 2007 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 GLD, the Gnu Linker. -GLD 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. + GLD 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. -GLD 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. + GLD 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. */ + 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, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ -#include "bfd.h" #include "sysdep.h" +#include "bfd.h" +#include "bfdlink.h" #include "libiberty.h" #include "demangle.h" - -#ifdef ANSI_PROTOTYPES #include -#define USE_STDARG 1 -#else -#include -#define USE_STDARG 0 -#endif - #include "ld.h" #include "ldmisc.h" #include "ldexp.h" #include "ldlang.h" -#include "ldgram.h" +#include #include "ldlex.h" #include "ldmain.h" #include "ldfile.h" - -static void vfinfo PARAMS ((FILE *, const char *, va_list)); +#include "elf-bfd.h" /* %% literal % + %A section name from a section + %B filename from a bfd + %C clever filename:linenumber with function + %D like %C, but no function name + %E current bfd error or errno %F error is fatal + %G like %D, but only function name + %I filename from a lang_input_statement_type %P print program name + %R info about a relent %S print script file and linenumber - %E current bfd error or errno - %I filename from a lang_input_statement_type - %B filename from a bfd %T symbol name - %X no object output, fail return %V hex bfd_vma - %v hex bfd_vma, no leading zeros %W hex bfd_vma with 0x with no leading zeros taking up 8 spaces - %C clever filename:linenumber with function - %D like %C, but no function name - %G like %D, but only function name - %R info about a relent - %s arbitrary string, like printf + %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 */ -char * -demangle (string) - const char *string; -{ - char *res; - - if (output_bfd != NULL - && bfd_get_symbol_leading_char (output_bfd) == string[0]) - ++string; - - /* This is a hack for better error reporting on XCOFF, or the MS PE - format. Xcoff has a single '.', while the NT PE for PPC has - '..'. So we remove all of them. */ - while (string[0] == '.') - ++string; - - res = cplus_demangle (string, DMGL_ANSI | DMGL_PARAMS); - return res ? res : xstrdup (string); -} - static void -vfinfo (fp, fmt, arg) - FILE *fp; - const char *fmt; - va_list arg; +vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning) { - boolean fatal = false; + bfd_boolean fatal = FALSE; while (*fmt != '\0') { @@ -107,10 +80,6 @@ vfinfo (fp, fmt, arg) fmt++; switch (*fmt++) { - default: - fprintf (fp, "%%%c", fmt[-1]); - break; - case '%': /* literal % */ putc ('%', fp); @@ -118,7 +87,7 @@ vfinfo (fp, fmt, arg) case 'X': /* no object output, fail return */ - config.make_executable = false; + config.make_executable = FALSE; break; case 'V': @@ -146,7 +115,7 @@ vfinfo (fp, fmt, arg) case 'W': /* hex bfd_vma with 0x with no leading zeroes taking up - 8 spaces. */ + 8 spaces. */ { char buf[100]; bfd_vma value; @@ -174,18 +143,49 @@ vfinfo (fp, fmt, arg) { const char *name = va_arg (arg, const char *); - if (name == (const char *) NULL || *name == 0) - fprintf (fp, _("no symbol")); - else if (! demangling) - fprintf (fp, "%s", name); - else + if (name == NULL || *name == 0) + { + fprintf (fp, _("no symbol")); + break; + } + else if (demangling) { char *demangled; - demangled = demangle (name); - fprintf (fp, "%s", demangled); - free (demangled); + demangled = bfd_demangle (output_bfd, name, + DMGL_ANSI | DMGL_PARAMS); + if (demangled != NULL) + { + fprintf (fp, "%s", demangled); + free (demangled); + break; + } } + fprintf (fp, "%s", name); + } + break; + + case 'A': + /* section name from a section */ + { + asection *sec = va_arg (arg, asection *); + bfd *abfd = sec->owner; + const char *group = NULL; + struct coff_comdat_info *ci; + + fprintf (fp, "%s", sec->name); + if (abfd != NULL + && bfd_get_flavour (abfd) == bfd_target_elf_flavour + && elf_next_in_group (sec) != NULL + && (sec->flags & SEC_GROUP) == 0) + group = elf_group_name (sec); + else if (abfd != NULL + && bfd_get_flavour (abfd) == bfd_target_coff_flavour + && (ci = bfd_coff_get_comdat_section (sec->owner, + sec)) != NULL) + group = ci->name; + if (group != NULL) + fprintf (fp, "[%s]", group); } break; @@ -193,7 +193,10 @@ vfinfo (fp, fmt, arg) /* filename from a bfd */ { bfd *abfd = va_arg (arg, bfd *); - if (abfd->my_archive) + + if (abfd == NULL) + fprintf (fp, "%s generated", program_name); + else if (abfd->my_archive) fprintf (fp, "%s(%s)", abfd->my_archive->filename, abfd->filename); else @@ -203,7 +206,7 @@ vfinfo (fp, fmt, arg) case 'F': /* Error is fatal. */ - fatal = true; + fatal = TRUE; break; case 'P': @@ -257,9 +260,8 @@ vfinfo (fp, fmt, arg) case 'C': case 'D': case 'G': - /* Clever filename:linenumber with function name if possible, - or section name as a last resort. The arguments are a BFD, - a section, and an offset. */ + /* Clever filename:linenumber with function name if possible. + The arguments are a BFD, a section, and an offset. */ { static bfd *last_bfd; static char *last_file = NULL; @@ -272,97 +274,109 @@ vfinfo (fp, fmt, arg) const char *filename; const char *functionname; unsigned int linenumber; - boolean discard_last; + bfd_boolean discard_last; abfd = va_arg (arg, bfd *); 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; + if (abfd == NULL) + { + entry = NULL; + asymbols = NULL; + } else { - 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 = (asymbol **) 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 = (lang_input_statement_type *) abfd->usrdata; + if (entry != (lang_input_statement_type *) NULL + && entry->asymbols != (asymbol **) NULL) + asymbols = entry->asymbols; + else { - entry->asymbols = asymbols; - entry->symbol_count = symbol_count; + long symsize; + long sym_count; + + symsize = bfd_get_symtab_upper_bound (abfd); + if (symsize < 0) + einfo (_("%B%F: could not read symbols\n"), abfd); + asymbols = xmalloc (symsize); + sym_count = bfd_canonicalize_symtab (abfd, asymbols); + if (sym_count < 0) + einfo (_("%B%F: could not read symbols\n"), abfd); + if (entry != (lang_input_statement_type *) NULL) + { + entry->asymbols = asymbols; + entry->symbol_count = sym_count; + } } } - discard_last = true; - if (bfd_find_nearest_line (abfd, section, asymbols, offset, - &filename, &functionname, - &linenumber)) + /* 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 (abfd != NULL + && bfd_find_nearest_line (abfd, section, asymbols, offset, + &filename, &functionname, + &linenumber)) { - if (functionname != NULL && fmt[-1] == 'G') + if (functionname != NULL && fmt[-1] == 'C') { - lfinfo (fp, "%B:", abfd); - if (filename != NULL - && strcmp (filename, bfd_get_filename (abfd)) != 0) - fprintf (fp, "%s:", filename); - lfinfo (fp, "%T", functionname); - } - else if (functionname != NULL && fmt[-1] == 'C') - { - if (filename == (char *) NULL) - filename = abfd->filename; - + /* 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 || last_bfd != abfd - || strcmp (last_file, filename) != 0 + || (filename != NULL + && strcmp (last_file, filename) != 0) || strcmp (last_function, functionname) != 0) { - /* We use abfd->filename in this initial line, - in case filename is a .h file or something - similarly unhelpful. */ lfinfo (fp, _("%B: In function `%T':\n"), abfd, functionname); last_bfd = abfd; if (last_file != NULL) free (last_file); - last_file = buystring (filename); + last_file = NULL; + if (filename) + last_file = xstrdup (filename); if (last_function != NULL) free (last_function); - last_function = buystring (functionname); + last_function = xstrdup (functionname); } - discard_last = false; - if (linenumber != 0) - fprintf (fp, "%s:%u", filename, linenumber); - else - lfinfo (fp, "%s(%s+0x%v)", filename, section->name, - offset); - } - else if (filename == NULL - || strcmp (filename, abfd->filename) == 0) - { - lfinfo (fp, "%B(%s+0x%v)", abfd, section->name, - offset); - if (linenumber != 0) - lfinfo (fp, ":%u", linenumber); + discard_last = FALSE; } - else if (linenumber != 0) - lfinfo (fp, "%B:%s:%u", abfd, filename, linenumber); else - lfinfo (fp, "%B(%s+0x%v):%s", abfd, section->name, - offset, filename); + lfinfo (fp, "%B:", abfd); + + if (filename != NULL) + fprintf (fp, "%s:", filename); + + if (functionname != NULL && fmt[-1] == 'G') + 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(%s+0x%v)", abfd, section->name, offset); + lfinfo (fp, "%B:(%A+0x%v)", abfd, section, offset); + + if (asymbols != NULL && entry == NULL) + free (asymbols); if (discard_last) { @@ -395,147 +409,104 @@ vfinfo (fp, fmt, 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) - config.make_executable = false; + if (is_warning && config.fatal_warnings) + config.make_executable = FALSE; - if (fatal == true) + if (fatal) xexit (1); } /* Format info message and print on stdout. */ /* (You would think this should be called just "info", but then you - would hosed by LynxOS, which defines that name in its libc.) */ + would be hosed by LynxOS, which defines that name in its libc.) */ void -#if USE_STDARG info_msg (const char *fmt, ...) -#else -info_msg (va_alist) - va_dcl -#endif { va_list arg; -#if ! USE_STDARG - const char *fmt; - - va_start (arg); - fmt = va_arg (arg, const char *); -#else va_start (arg, fmt); -#endif - - vfinfo (stdout, fmt, arg); + vfinfo (stdout, fmt, arg, FALSE); va_end (arg); } /* ('e' for error.) Format info message and print on stderr. */ void -#if USE_STDARG einfo (const char *fmt, ...) -#else -einfo (va_alist) - va_dcl -#endif { va_list arg; -#if ! USE_STDARG - const char *fmt; - - va_start (arg); - fmt = va_arg (arg, const char *); -#else va_start (arg, fmt); -#endif - - vfinfo (stderr, fmt, arg); + vfinfo (stderr, fmt, arg, TRUE); va_end (arg); } void -info_assert (file, line) - const char *file; - unsigned int line; +info_assert (const char *file, unsigned int line) { einfo (_("%F%P: internal error %s %d\n"), file, line); } -char * -buystring (x) - CONST char *CONST x; -{ - size_t l = strlen (x) + 1; - char *r = xmalloc (l); - memcpy (r, x, l); - return r; -} - /* ('m' for map) Format info message and print on map. */ void -#if USE_STDARG minfo (const char *fmt, ...) -#else -minfo (va_alist) - va_dcl -#endif { - va_list arg; - -#if ! USE_STDARG - const char *fmt; - va_start (arg); - fmt = va_arg (arg, const char *); -#else - va_start (arg, fmt); -#endif + if (config.map_file != NULL) + { + va_list arg; - vfinfo (config.map_file, fmt, arg); - va_end (arg); + va_start (arg, fmt); + vfinfo (config.map_file, fmt, arg, FALSE); + va_end (arg); + } } void -#if USE_STDARG lfinfo (FILE *file, const char *fmt, ...) -#else -lfinfo (va_alist) - va_dcl -#endif { va_list arg; -#if ! USE_STDARG - FILE *file; - const char *fmt; - - va_start (arg); - file = va_arg (arg, FILE *); - fmt = va_arg (arg, const char *); -#else va_start (arg, fmt); -#endif - - vfinfo (file, fmt, arg); + vfinfo (file, fmt, arg, FALSE); va_end (arg); } /* Functions to print the link map. */ void -print_space () +print_space (void) { fprintf (config.map_file, " "); } void -print_nl () +print_nl (void) { fprintf (config.map_file, "\n"); } @@ -544,10 +515,7 @@ print_nl () call this function. */ void -ld_abort (file, line, fn) - const char *file; - int line; - const char *fn; +ld_abort (const char *file, int line, const char *fn) { if (fn != NULL) einfo (_("%P: internal error: aborting at %s line %d in %s\n"),