X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Fldmisc.c;h=420ddb13c18273f786cb4c6ef3ad1d7d00061352;hb=a826403eb6f0ad2fb8c88b45ea3cf5ba39cdaa75;hp=cc9131e424626dffddef79aac5e2f6b1bddbe1c5;hpb=98d87ee7098974945b6623bd45dbd18f02e61e57;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/ldmisc.c b/ld/ldmisc.c
index cc9131e424..420ddb13c1 100644
--- a/ld/ldmisc.c
+++ b/ld/ldmisc.c
@@ -1,30 +1,29 @@
 /* ldmisc.c
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2002, 2003, 2004
-   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
+   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 "filenames.h"
 #include "demangle.h"
 #include <stdarg.h>
 #include "ld.h"
@@ -36,6 +35,7 @@
 #include "ldmain.h"
 #include "ldfile.h"
 #include "elf-bfd.h"
+#include "coff-bfd.h"
 
 /*
  %% literal %
@@ -46,42 +46,45 @@
  %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 print script file and linenumber
+ %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
 */
 
-static void
-vfinfo (FILE *fp, const char *fmt, va_list arg)
+void
+vfinfo (FILE *fp, const char *fmt, va_list arg, bfd_boolean is_warning)
 {
   bfd_boolean fatal = FALSE;
 
   while (*fmt != '\0')
     {
+      const char *str = fmt;
       while (*fmt != '%' && *fmt != '\0')
-	{
-	  putc (*fmt, fp);
-	  fmt++;
-	}
+	fmt++;
+      if (fmt != str)
+	if (fwrite (str, 1, fmt - str, fp))
+	  {
+	    /* Ignore.  */
+	  }
 
       if (*fmt == '%')
 	{
 	  fmt++;
 	  switch (*fmt++)
 	    {
-	    default:
-	      fprintf (fp, "%%%c", fmt[-1]);
-	      break;
-
 	    case '%':
 	      /* literal % */
 	      putc ('%', fp);
@@ -146,17 +149,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,8 +200,9 @@ vfinfo (FILE *fp, const char *fmt, va_list arg)
 		bfd *abfd = va_arg (arg, bfd *);
 
 		if (abfd == NULL)
-		  fprintf (fp, "<none>");
-		else if (abfd->my_archive)
+		  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
@@ -220,24 +231,33 @@ vfinfo (FILE *fp, const char *fmt, va_list 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);
+	      {
+		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':
@@ -255,75 +275,67 @@ vfinfo (FILE *fp, const char *fmt, va_list arg)
 	    case 'C':
 	    case 'D':
 	    case 'G':
+	    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;
 		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 = 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);
 		  }
 
-		/* The GNU Coding Standard requires that error messages be of the form:
-		   
+		/* 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.  */
+		   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 (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))
 		  {
-		    if (functionname != NULL && fmt[-1] == 'C')
+		    if (functionname != NULL
+			&& (fmt[-1] == 'C' || fmt[-1] == 'H'))
 		      {
-			/* 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.  */
+			/* 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
+			    || (last_file == NULL) != (filename == NULL)
 			    || (filename != NULL
-				&& strcmp (last_file, filename) != 0)
+				&& filename_cmp (last_file, filename) != 0)
 			    || strcmp (last_function, functionname) != 0)
 			  {
 			    lfinfo (fp, _("%B: In function `%T':\n"),
@@ -347,21 +359,21 @@ vfinfo (FILE *fp, const char *fmt, va_list arg)
 		    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)
-		      {
-			if (linenumber != 0)
-			  fprintf (fp, "%u", linenumber);
-			else
-			  lfinfo (fp, "(%A+0x%v)", section, offset);
-		      }
+		    else if (filename != NULL && linenumber != 0)
+		      fprintf (fp, "%u%s", linenumber, done ? "" : ":");
+		    else
+		      done = FALSE;
 		  }
 		else
-		  lfinfo (fp, "%B:(%A+0x%v)", abfd, section, offset);
-
-		if (asymbols != NULL && entry == NULL)
-		  free (asymbols);
+		  {
+		    lfinfo (fp, "%B:", abfd);
+		    done = FALSE;
+		  }
+		if (!done)
+		  lfinfo (fp, "(%A+0x%v)", section, offset);
 
 		if (discard_last)
 		  {
@@ -380,6 +392,11 @@ vfinfo (FILE *fp, const char *fmt, va_list 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 *));
@@ -394,59 +411,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;
+		}
+	      /* Fallthru */
+
+	    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
@@ -458,7 +452,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);
 }
 
@@ -469,9 +463,11 @@ einfo (const char *fmt, ...)
 {
   va_list arg;
 
+  fflush (stdout);
   va_start (arg, fmt);
-  vfinfo (stderr, fmt, arg);
+  vfinfo (stderr, fmt, arg, TRUE);
   va_end (arg);
+  fflush (stderr);
 }
 
 void
@@ -485,11 +481,29 @@ 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);
+      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);
+    }
 }
 
 void
@@ -498,7 +512,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);
 }
 
@@ -523,10 +537,10 @@ void
 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"),
+    einfo (_("%P: internal error: aborting at %s:%d in %s\n"),
 	   file, line, fn);
   else
-    einfo (_("%P: internal error: aborting at %s line %d\n"),
+    einfo (_("%P: internal error: aborting at %s:%d\n"),
 	   file, line);
   einfo (_("%P%F: please report this bug\n"));
   xexit (1);