Changeset 609 for branches/GNU/src/binutils/ld/ldmisc.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/ld/ldmisc.c (modified) (15 diffs, 1 prop)

branches/GNU/src/binutils/ld/ldmisc.c

@@ -1 +1 @@
 /* ldmisc.c
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2002, 2003
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support.
 
-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 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.  */
+   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 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.  */
 
 #include "bfd.h"
@@ -28 +29 @@
 #ifdef ANSI_PROTOTYPES
 #include <stdarg.h>
-#define USE_STDARG 1
 #else
 #include <varargs.h>
-#define USE_STDARG 0
 #endif
 
@@ -38 +37 @@
 #include "ldexp.h"
 #include "ldlang.h"
-#include "ldgram.h"
+#include <ldgram.h>
 #include "ldlex.h"
 #include "ldmain.h"
@@ -67 +66 @@
 */
 
-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)
@@ -93 +72 @@
      va_list arg;
 {
-  boolean fatal = false;
+  bfd_boolean fatal = FALSE;
 
   while (*fmt != '\0')
@@ -119 +98 @@
             case 'X':
               /* no object output, fail return */
-              config.make_executable = false;
+              config.make_executable = FALSE;
               break;
 
@@ -204 +183 @@
             case 'F':
               /* Error is fatal.  */
-              fatal = true;
+              fatal = TRUE;
               break;
 
@@ -258 +237 @@
             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;
@@ -273 +251 @@
                 const char *functionname;
                 unsigned int linenumber;
-                boolean discard_last;
+                bfd_boolean discard_last;
 
                 abfd = va_arg (arg, bfd *);
@@ -302 +280 @@
                   }
 
-                discard_last = true;
+                lfinfo (fp, "%B(%s+0x%v)", abfd, section->name, offset);
+
+                discard_last = TRUE;
                 if (bfd_find_nearest_line (abfd, section, asymbols, offset,
                                            &filename, &functionname,
                                            &linenumber))
                   {
-                    if (functionname != NULL && fmt[-1] == 'G')
+                    bfd_boolean need_colon = TRUE;
+
+                    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;
-
                         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);
+                            lfinfo (fp, _(": In function `%T':\n"),
+                                    functionname);
+                            need_colon = FALSE;
 
                             last_bfd = abfd;
                             if (last_file != NULL)
                               free (last_file);
-                            last_file = xstrdup (filename);
+                            last_file = NULL;
+                            if (filename)
+                              last_file = xstrdup (filename);
                             if (last_function != NULL)
                               free (last_function);
                             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);
+                        discard_last = FALSE;
                       }
-                    else if (filename == NULL
-                             || strcmp (filename, abfd->filename) == 0)
+
+                    if (filename != NULL)
                       {
-                        lfinfo (fp, "%B(%s+0x%v)", abfd, section->name,
-                                offset);
-                        if (linenumber != 0)
-                          lfinfo (fp, ":%u", linenumber);
+                        if (need_colon)
+                          putc (':', fp);
+                        fputs (filename, fp);
                       }
-                    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);
+
+                    if (functionname != NULL && fmt[-1] == 'G')
+                      lfinfo (fp, ":%T", functionname);
+                    else if (filename != NULL && linenumber != 0)
+                      fprintf (fp, ":%u", linenumber);
                   }
-                else
-                  lfinfo (fp, "%B(%s+0x%v)", abfd, section->name, offset);
+
+                if (asymbols != NULL && entry == NULL)
+                  free (asymbols);
 
                 if (discard_last)
@@ -400 +367 @@
     }
 
-  if (fatal == true)
+  if (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 (name)
+     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);
 }
 
@@ -410 +423 @@
 
 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
+info_msg VPARAMS ((const char *fmt, ...))
+{
+  VA_OPEN (arg, fmt);
+  VA_FIXEDARG (arg, const char *, fmt);
 
   vfinfo (stdout, fmt, arg);
-  va_end (arg);
+  VA_CLOSE (arg);
 }
 
@@ -435 +435 @@
 
 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
+einfo VPARAMS ((const char *fmt, ...))
+{
+  VA_OPEN (arg, fmt);
+  VA_FIXEDARG (arg, const char *, fmt);
 
   vfinfo (stderr, fmt, arg);
-  va_end (arg);
+  VA_CLOSE (arg);
 }
 
@@ -468 +455 @@
 
 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
+minfo VPARAMS ((const char *fmt, ...))
+{
+  VA_OPEN (arg, fmt);
+  VA_FIXEDARG (arg, const char *, fmt);
 
   vfinfo (config.map_file, fmt, arg);
-  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
+  VA_CLOSE (arg);
+}
+
+void
+lfinfo VPARAMS ((FILE *file, const char *fmt, ...))
+{
+  VA_OPEN (arg, fmt);
+  VA_FIXEDARG (arg, FILE *, file);
+  VA_FIXEDARG (arg, const char *, fmt);
 
   vfinfo (file, fmt, arg);
-  va_end (arg);
+  VA_CLOSE (arg);
 }
 
@@ -547 +508 @@
   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;
+}