X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Fldmisc.c;h=3ba4221e6ee2b9dcfd60ba298c7cbe67ce3d21d8;hb=d9ca002e6bdd3ee14dd302ffb2b0dd891633b738;hp=a2e496da9c07552c88548ea178e9d6787ef995a1;hpb=0f0569c4ae6c593d573b2961438826fc80ae1e42;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldmisc.c b/ld/ldmisc.c index a2e496da9c..3ba4221e6e 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, 2002, 2003 + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. Written by Steve Chamberlain of Cygnus Support. @@ -18,20 +18,15 @@ 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. */ + Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ #include "bfd.h" +#include "bfdlink.h" #include "sysdep.h" #include "libiberty.h" #include "demangle.h" - -#ifdef ANSI_PROTOTYPES #include -#else -#include -#endif - #include "ld.h" #include "ldmisc.h" #include "ldexp.h" @@ -40,36 +35,35 @@ #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 */ 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) { bfd_boolean fatal = FALSE; @@ -86,10 +80,6 @@ vfinfo (fp, fmt, arg) fmt++; switch (*fmt++) { - default: - fprintf (fp, "%%%c", fmt[-1]); - break; - case '%': /* literal % */ putc ('%', fp); @@ -125,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; @@ -153,7 +143,7 @@ vfinfo (fp, fmt, arg) { const char *name = va_arg (arg, const char *); - if (name == (const char *) NULL || *name == 0) + if (name == NULL || *name == 0) fprintf (fp, _("no symbol")); else if (! demangling) fprintf (fp, "%s", name); @@ -168,11 +158,38 @@ vfinfo (fp, fmt, arg) } 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; + case 'B': /* 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 @@ -256,40 +273,62 @@ vfinfo (fp, fmt, 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; + 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; + } } } - lfinfo (fp, "%B(%s+0x%v)", abfd, section->name, 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 @@ -298,9 +337,8 @@ vfinfo (fp, fmt, 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'"), + abfd, functionname); last_bfd = abfd; if (last_file != NULL) @@ -314,19 +352,24 @@ vfinfo (fp, fmt, 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); - else if (filename != NULL && linenumber != 0) - fprintf (fp, ":%u", linenumber); + else if (filename != NULL) + { + if (linenumber != 0) + fprintf (fp, ":%u", linenumber); + else + lfinfo (fp, ":(%A+0x%v)", section, offset); + } } + else + lfinfo (fp, "%B:(%A+0x%v)", abfd, section, offset); if (asymbols != NULL && entry == NULL) free (asymbols); @@ -362,11 +405,30 @@ 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) + if (is_warning && config.fatal_warnings) config.make_executable = FALSE; if (fatal) @@ -377,8 +439,7 @@ vfinfo (fp, fmt, arg) other such chars that would otherwise confuse the demangler. */ char * -demangle (name) - const char *name; +demangle (const char *name) { char *res; const char *p; @@ -419,34 +480,32 @@ demangle (name) /* 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 -info_msg VPARAMS ((const char *fmt, ...)) +info_msg (const char *fmt, ...) { - VA_OPEN (arg, fmt); - VA_FIXEDARG (arg, const char *, fmt); + va_list arg; - vfinfo (stdout, fmt, arg); - VA_CLOSE (arg); + va_start (arg, fmt); + vfinfo (stdout, fmt, arg, FALSE); + va_end (arg); } /* ('e' for error.) Format info message and print on stderr. */ void -einfo VPARAMS ((const char *fmt, ...)) +einfo (const char *fmt, ...) { - VA_OPEN (arg, fmt); - VA_FIXEDARG (arg, const char *, fmt); + va_list arg; - vfinfo (stderr, fmt, arg); - VA_CLOSE (arg); + va_start (arg, fmt); + 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); } @@ -454,36 +513,35 @@ info_assert (file, line) /* ('m' for map) Format info message and print on map. */ void -minfo VPARAMS ((const char *fmt, ...)) +minfo (const char *fmt, ...) { - VA_OPEN (arg, fmt); - VA_FIXEDARG (arg, const char *, fmt); + va_list arg; - vfinfo (config.map_file, fmt, arg); - VA_CLOSE (arg); + va_start (arg, fmt); + vfinfo (config.map_file, fmt, arg, FALSE); + va_end (arg); } void -lfinfo VPARAMS ((FILE *file, const char *fmt, ...)) +lfinfo (FILE *file, const char *fmt, ...) { - VA_OPEN (arg, fmt); - VA_FIXEDARG (arg, FILE *, file); - VA_FIXEDARG (arg, const char *, fmt); + va_list arg; - vfinfo (file, fmt, arg); - VA_CLOSE (arg); + va_start (arg, fmt); + 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"); } @@ -492,10 +550,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"), @@ -506,14 +561,3 @@ ld_abort (file, line, fn) einfo (_("%P%F: please report this bug\n")); xexit (1); } - -bfd_boolean -error_handler VPARAMS ((int id ATTRIBUTE_UNUSED, const char *fmt, ...)) -{ - VA_OPEN (arg, fmt); - VA_FIXEDARG (arg, const char *, fmt); - - vfinfo (stderr, fmt, arg); - VA_CLOSE (arg); - return TRUE; -}