X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Fldmisc.c;h=420ddb13c18273f786cb4c6ef3ad1d7d00061352;hb=35837774a77d641ba3ae75930a7b08ed853759ad;hp=1e08efbebe7924885c281dc367347947a53522bc;hpb=e98fe4f7b54cbdf29aef9287bbb1bea8801dd05a;p=deliverable%2Fbinutils-gdb.git diff --git a/ld/ldmisc.c b/ld/ldmisc.c index 1e08efbebe..420ddb13c1 100644 --- a/ld/ldmisc.c +++ b/ld/ldmisc.c @@ -1,117 +1,90 @@ /* ldmisc.c - Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc. + Copyright (C) 1991-2017 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 -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. + 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 3 of the License, 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. + 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. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 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 "filenames.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" - - -#if USE_STDARG -static void finfo PARAMS ((FILE *, const char *, ...)); -#else -/* VARARGS*/ -static void finfo (); -#endif +#include "elf-bfd.h" +#include "coff-bfd.h" /* %% literal % - %F error is fatal - %P print program name - %S print script file and linenumber - %E current bfd error or errno - %I filename from a lang_input_statement_type + %A section name from a section %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 %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 + %H like %C but in addition emit section+offset + %I filename from a lang_input_statement_type + %P print program name %R info about a relent - %s arbitrary string, like printf + %S print script file and linenumber from etree_type. + %T symbol name + %V hex bfd_vma + %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 + %p native (host) void* pointer, 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. */ - if (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; +void +vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning) { - boolean fatal = false; + bfd_boolean fatal = FALSE; while (*fmt != '\0') { - while (*fmt != '%' && *fmt != '\0') + const char *str = fmt; + while (*fmt != '%' && *fmt != '\0') + fmt++; + if (fmt != str) + if (fwrite (str, 1, fmt - str, fp)) + { + /* Ignore. */ + } + + if (*fmt == '%') { - putc (*fmt, fp); fmt++; - } - - if (*fmt == '%') - { - fmt ++; - switch (*fmt++) + switch (*fmt++) { - default: - fprintf (fp,"%%%c", fmt[-1]); - break; - case '%': /* literal % */ putc ('%', fp); @@ -119,7 +92,7 @@ vfinfo (fp, fmt, arg) case 'X': /* no object output, fail return */ - config.make_executable = false; + config.make_executable = FALSE; break; case 'V': @@ -145,29 +118,91 @@ vfinfo (fp, fmt, arg) } break; + case 'W': + /* hex bfd_vma with 0x with no leading zeroes taking up + 8 spaces. */ + { + char buf[100]; + bfd_vma value; + char *p; + int len; + + value = va_arg (arg, bfd_vma); + sprintf_vma (buf, value); + for (p = buf; *p == '0'; ++p) + ; + if (*p == '\0') + --p; + len = strlen (p); + while (len < 8) + { + putc (' ', fp); + ++len; + } + fprintf (fp, "0x%s", p); + } + break; + case 'T': /* Symbol name. */ { const char *name = va_arg (arg, const char *); - if (name == (const char *) NULL) - fprintf (fp, "no symbol"); - 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 (link_info.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; 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 != NULL + && !bfd_is_thin_archive (abfd->my_archive)) fprintf (fp, "%s(%s)", abfd->my_archive->filename, abfd->filename); else @@ -176,18 +211,18 @@ vfinfo (fp, fmt, arg) break; case 'F': - /* error is fatal */ - fatal = true; + /* Error is fatal. */ + fatal = TRUE; break; case 'P': - /* print program name */ + /* Print program name. */ fprintf (fp, "%s", program_name); break; case 'E': /* current bfd error or errno */ - fprintf (fp, bfd_errmsg (bfd_get_error ())); + fprintf (fp, "%s", bfd_errmsg (bfd_get_error ())); break; case 'I': @@ -196,146 +231,149 @@ vfinfo (fp, fmt, arg) lang_input_statement_type *i; i = va_arg (arg, lang_input_statement_type *); - if (bfd_my_archive (i->the_bfd) != NULL) + if (i->the_bfd->my_archive != NULL + && !bfd_is_thin_archive (i->the_bfd->my_archive)) fprintf (fp, "(%s)", - bfd_get_filename (bfd_my_archive (i->the_bfd))); + bfd_get_filename (i->the_bfd->my_archive)); fprintf (fp, "%s", i->local_sym_name); - if (bfd_my_archive (i->the_bfd) == NULL - && strcmp (i->local_sym_name, i->filename) != 0) + if ((i->the_bfd->my_archive == NULL + || bfd_is_thin_archive (i->the_bfd->my_archive)) + && filename_cmp (i->local_sym_name, i->filename) != 0) fprintf (fp, " (%s)", i->filename); } break; case 'S': - /* print script file and linenumber */ - if (parsing_defsym) - fprintf (fp, "--defsym %s", lex_string); - else if (ldfile_input_filename != NULL) - fprintf (fp, "%s:%u", ldfile_input_filename, lineno); - else - fprintf (fp, "built in linker script:%u", lineno); + /* Print script file and linenumber. */ + { + etree_type node; + etree_type *tp = va_arg (arg, etree_type *); + + if (tp == NULL) + { + tp = &node; + tp->type.filename = ldlex_filename (); + tp->type.lineno = lineno; + } + if (tp->type.filename != NULL) + fprintf (fp, "%s:%u", tp->type.filename, tp->type.lineno); + } break; case 'R': - /* Print all that's interesting about a relent */ + /* Print all that's interesting about a relent. */ { arelent *relent = va_arg (arg, arelent *); - - finfo (fp, "%s+0x%v (type %s)", - (*(relent->sym_ptr_ptr))->name, - relent->addend, - relent->howto->name); + + lfinfo (fp, "%s+0x%v (type %s)", + (*(relent->sym_ptr_ptr))->name, + relent->addend, + relent->howto->name); } break; - + 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. */ + case 'H': + /* 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; - static char *last_function = NULL; + static char *last_file; + static char *last_function; 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; - boolean discard_last; + bfd_boolean discard_last; + bfd_boolean done; 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; - 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 = (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->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); } - 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 instead. */ + discard_last = TRUE; + if (abfd != NULL + && bfd_find_nearest_line (abfd, section, asymbols, offset, + &filename, &functionname, + &linenumber)) { - if (functionname != NULL && fmt[-1] == 'G') - { - finfo (fp, "%B:", abfd); - if (filename != NULL - && strcmp (filename, bfd_get_filename (abfd)) != 0) - fprintf (fp, "%s:", filename); - finfo (fp, "%T", functionname); - } - else if (functionname != NULL && fmt[-1] == 'C') + if (functionname != NULL + && (fmt[-1] == 'C' || fmt[-1] == 'H')) { - 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 + || (last_file == NULL) != (filename == NULL) + || (filename != NULL + && filename_cmp (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. */ - finfo (fp, "%B: In function `%T':\n", - abfd, functionname); + 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 - finfo (fp, "%s(%s+0x%v)", filename, section->name, - offset); - } - else if (filename == NULL - || strcmp (filename, abfd->filename) == 0) - { - finfo (fp, "%B(%s+0x%v)", abfd, section->name, offset); - if (linenumber != 0) - finfo (fp, ":%u", linenumber); + discard_last = FALSE; } - else if (linenumber != 0) - finfo (fp, "%B:%s:%u", abfd, filename, linenumber); else - finfo (fp, "%B(%s+0x%v):%s", abfd, section->name, offset, - filename); + lfinfo (fp, "%B:", abfd); + + if (filename != NULL) + fprintf (fp, "%s:", filename); + + done = fmt[-1] != 'H'; + if (functionname != NULL && fmt[-1] == 'G') + lfinfo (fp, "%T", functionname); + else if (filename != NULL && linenumber != 0) + fprintf (fp, "%u%s", linenumber, done ? "" : ":"); + else + done = FALSE; } else - finfo (fp, "%B(%s+0x%v)", abfd, section->name, offset); + { + lfinfo (fp, "%B:", abfd); + done = FALSE; + } + if (!done) + lfinfo (fp, "(%A+0x%v)", section, offset); if (discard_last) { @@ -353,7 +391,12 @@ vfinfo (fp, fmt, arg) } } break; - + + case 'p': + /* native (host) void* pointer, like printf */ + fprintf (fp, "%p", va_arg (arg, void *)); + break; + case 's': /* arbitrary string, like printf */ fprintf (fp, "%s", va_arg (arg, char *)); @@ -368,151 +411,137 @@ 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; + } + /* Fallthru */ + + default: + fprintf (fp, "%%%c", fmt[-1]); + break; } } } - if (fatal == true) - xexit(1); + if (is_warning && config.fatal_warnings) + config.make_executable = FALSE; + + if (fatal) + xexit (1); } -/* Format info message and print on stdout. */ +/* 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. */ +/* ('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 + fflush (stdout); va_start (arg, fmt); -#endif - - vfinfo (stderr, fmt, arg); + vfinfo (stderr, fmt, arg, TRUE); va_end (arg); + fflush (stderr); } -void -info_assert (file, line) - const char *file; - unsigned int line; -{ - einfo ("%F%P: internal error %s %d\n", file, line); -} - -char * -buystring (x) - CONST char *CONST x; +void +info_assert (const char *file, unsigned int line) { - size_t l = strlen(x)+1; - char *r = xmalloc(l); - memcpy(r, x,l); - return r; + einfo (_("%F%P: internal error %s %d\n"), file, line); } -/* ('m' for map) Format info message and print on map. */ +/* ('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); + if (fmt[0] == '%' && fmt[1] == '!' && fmt[2] == 0) + { + /* Stash info about --as-needed shared libraries. Print + later so they don't appear intermingled with archive + library info. */ + struct asneeded_minfo *m = xmalloc (sizeof *m); + + m->next = NULL; + m->soname = va_arg (arg, const char *); + m->ref = va_arg (arg, bfd *); + m->name = va_arg (arg, const char *); + *asneeded_list_tail = m; + asneeded_list_tail = &m->next; + } + else + vfinfo (config.map_file, fmt, arg, FALSE); + va_end (arg); + } } -static void -#if USE_STDARG -finfo (FILE *file, const char *fmt, ...) -#else -finfo (va_alist) - va_dcl -#endif +void +lfinfo (FILE *file, const char *fmt, ...) { 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 () +void +print_space (void) { fprintf (config.map_file, " "); } -void -print_nl () +void +print_nl (void) { fprintf (config.map_file, "\n"); } -void -print_address (value) - bfd_vma value; +/* A more or less friendly abort message. In ld.h abort is defined to + call this function. */ + +void +ld_abort (const char *file, int line, const char *fn) { - fprintf_vma (config.map_file, value); + if (fn != NULL) + einfo (_("%P: internal error: aborting at %s:%d in %s\n"), + file, line, fn); + else + einfo (_("%P: internal error: aborting at %s:%d\n"), + file, line); + einfo (_("%P%F: please report this bug\n")); + xexit (1); }