gdb: add target_ops::supports_displaced_step

[deliverable/binutils-gdb.git] / binutils / nm.c

diff --git a/binutils/nm.c b/binutils/nm.c
index 62bc2b46198e20b48f96e7fe9cc0f4b6f94fda84..1b5122d56ab5c00fc710a775053eb2ee300b0665 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -1,13 +1,11 @@
 /* nm.c -- Describe symbol table of a rel file.
 /* nm.c -- Describe symbol table of a rel file.

-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 1991-2020 Free Software Foundation, Inc.

 
    This file is part of GNU Binutils.
 
    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
 
    This file is part of GNU Binutils.
 
    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 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -17,13 +15,12 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 

+#include "sysdep.h"

 #include "bfd.h"
 #include "progress.h"
 #include "bfd.h"
 #include "progress.h"

-#include "bucomm.h"
-#include "budemang.h"

 #include "getopt.h"
 #include "aout/stab_gnu.h"
 #include "aout/ranlib.h"
 #include "getopt.h"
 #include "aout/stab_gnu.h"
 #include "aout/ranlib.h"


@@ -31,13 +28,23 @@
 #include "libiberty.h"
 #include "elf-bfd.h"
 #include "elf/common.h"
 #include "libiberty.h"
 #include "elf-bfd.h"
 #include "elf/common.h"

+#define DO_NOT_DEFINE_AOUTHDR
+#define DO_NOT_DEFINE_FILHDR
+#define DO_NOT_DEFINE_LINENO
+#define DO_NOT_DEFINE_SCNHDR
+#include "coff/external.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+#include "bucomm.h"
+#include "plugin-api.h"
+#include "plugin.h"

 
 /* When sorting by size, we use this structure to hold the size and a
    pointer to the minisymbol.  */
 
 struct size_sym
 {
 
 /* When sorting by size, we use this structure to hold the size and a
    pointer to the minisymbol.  */
 
 struct size_sym
 {

-  const PTR minisym;
+  const void *minisym;

   bfd_vma size;
 };
 
   bfd_vma size;
 };
 


@@ -57,9 +64,9 @@ struct extended_symbol_info
   symbol_info *sinfo;
   bfd_vma ssize;
   elf_symbol_type *elfinfo;
   symbol_info *sinfo;
   bfd_vma ssize;
   elf_symbol_type *elfinfo;

+  coff_symbol_type *coffinfo;

   /* FIXME: We should add more fields for Type, Line, Section.  */
 };
   /* FIXME: We should add more fields for Type, Line, Section.  */
 };

-#define SYM_NAME(sym)        (sym->sinfo->name)

 #define SYM_VALUE(sym)       (sym->sinfo->value)
 #define SYM_TYPE(sym)        (sym->sinfo->type)
 #define SYM_STAB_NAME(sym)   (sym->sinfo->stab_name)
 #define SYM_VALUE(sym)       (sym->sinfo->value)
 #define SYM_TYPE(sym)        (sym->sinfo->type)
 #define SYM_STAB_NAME(sym)   (sym->sinfo->stab_name)


@@ -68,66 +75,42 @@ struct extended_symbol_info
 #define SYM_SIZE(sym) \
   (sym->elfinfo ? sym->elfinfo->internal_elf_sym.st_size: sym->ssize)
 
 #define SYM_SIZE(sym) \
   (sym->elfinfo ? sym->elfinfo->internal_elf_sym.st_size: sym->ssize)
 

-static void usage                PARAMS ((FILE *, int));
-static void set_print_radix      PARAMS ((char *));
-static void set_output_format    PARAMS ((char *));
-static void display_archive      PARAMS ((bfd *));
-static boolean display_file      PARAMS ((char *));
-static void display_rel_file     PARAMS ((bfd *, bfd *));
-static long filter_symbols       PARAMS ((bfd *, boolean, PTR, long, unsigned int));
-static long sort_symbols_by_size PARAMS ((bfd *, boolean, PTR, long, unsigned int, struct size_sym **));
-static void print_symbols        PARAMS ((bfd *, boolean, PTR, long, unsigned int, bfd *));
-static void print_size_symbols   PARAMS ((bfd *, boolean, struct size_sym *, long, bfd *));
-static void print_symname        PARAMS ((const char *, const char *, bfd *));
-static void print_symbol         PARAMS ((bfd *, asymbol *, bfd_vma ssize, bfd *));
-static void print_symdef_entry   PARAMS ((bfd *));
-
-/* The sorting functions.  */
-static int numeric_forward PARAMS ((const PTR, const PTR));
-static int numeric_reverse PARAMS ((const PTR, const PTR));
-static int non_numeric_forward PARAMS ((const PTR, const PTR));
-static int non_numeric_reverse PARAMS ((const PTR, const PTR));
-static int size_forward1 PARAMS ((const PTR, const PTR));
-static int size_forward2 PARAMS ((const PTR, const PTR));
-

 /* The output formatting functions.  */
 /* The output formatting functions.  */

-static void print_object_filename_bsd PARAMS ((char *));
-static void print_object_filename_sysv PARAMS ((char *));
-static void print_object_filename_posix PARAMS ((char *));
-static void print_archive_filename_bsd PARAMS ((char *));
-static void print_archive_filename_sysv PARAMS ((char *));
-static void print_archive_filename_posix PARAMS ((char *));
-static void print_archive_member_bsd PARAMS ((char *, const char *));
-static void print_archive_member_sysv PARAMS ((char *, const char *));
-static void print_archive_member_posix PARAMS ((char *, const char *));
-static void print_symbol_filename_bsd PARAMS ((bfd *, bfd *));
-static void print_symbol_filename_sysv PARAMS ((bfd *, bfd *));
-static void print_symbol_filename_posix PARAMS ((bfd *, bfd *));
-static void print_value PARAMS ((bfd *, bfd_vma));
-static void print_symbol_info_bsd PARAMS ((struct extended_symbol_info *, bfd *));
-static void print_symbol_info_sysv PARAMS ((struct extended_symbol_info *, bfd *));
-static void print_symbol_info_posix PARAMS ((struct extended_symbol_info *, bfd *));
-static void get_relocs PARAMS ((bfd *, asection *, PTR));
-static const char * get_symbol_type PARAMS ((unsigned int));
+static void print_object_filename_bsd (const char *);
+static void print_object_filename_sysv (const char *);
+static void print_object_filename_posix (const char *);
+static void print_archive_filename_bsd (const char *);
+static void print_archive_filename_sysv (const char *);
+static void print_archive_filename_posix (const char *);
+static void print_archive_member_bsd (const char *, const char *);
+static void print_archive_member_sysv (const char *, const char *);
+static void print_archive_member_posix (const char *, const char *);
+static void print_symbol_filename_bsd (bfd *, bfd *);
+static void print_symbol_filename_sysv (bfd *, bfd *);
+static void print_symbol_filename_posix (bfd *, bfd *);
+static void print_value (bfd *, bfd_vma);
+static void print_symbol_info_bsd (struct extended_symbol_info *, bfd *);
+static void print_symbol_info_sysv (struct extended_symbol_info *, bfd *);
+static void print_symbol_info_posix (struct extended_symbol_info *, bfd *);

 
 /* Support for different output formats.  */
 struct output_fns
   {
     /* Print the name of an object file given on the command line.  */
 
 /* Support for different output formats.  */
 struct output_fns
   {
     /* Print the name of an object file given on the command line.  */

-    void (*print_object_filename) PARAMS ((char *));
+    void (*print_object_filename) (const char *);

 
     /* Print the name of an archive file given on the command line.  */
 
     /* Print the name of an archive file given on the command line.  */

-    void (*print_archive_filename) PARAMS ((char *));
+    void (*print_archive_filename) (const char *);

 
     /* Print the name of an archive member file.  */
 
     /* Print the name of an archive member file.  */

-    void (*print_archive_member) PARAMS ((char *, const char *));
+    void (*print_archive_member) (const char *, const char *);

 
     /* Print the name of the file (and archive, if there is one)
        containing a symbol.  */
 
     /* Print the name of the file (and archive, if there is one)
        containing a symbol.  */

-    void (*print_symbol_filename) PARAMS ((bfd *, bfd *));
+    void (*print_symbol_filename) (bfd *, bfd *);

 
     /* Print a line of information about a symbol.  */
 
     /* Print a line of information about a symbol.  */

-    void (*print_symbol_info) PARAMS ((struct extended_symbol_info *, bfd *));
+    void (*print_symbol_info) (struct extended_symbol_info *, bfd *);

   };
 
 static struct output_fns formats[] =
   };
 
 static struct output_fns formats[] =


@@ -157,6 +140,8 @@ static struct output_fns formats[] =
 
 /* The output format to use.  */
 static struct output_fns *format = &formats[FORMAT_DEFAULT];
 
 /* The output format to use.  */
 static struct output_fns *format = &formats[FORMAT_DEFAULT];

+static unsigned int print_format = FORMAT_DEFAULT;
+static const char *print_format_string = NULL;

 
 /* Command options.  */
 
 
 /* Command options.  */
 


@@ -173,40 +158,42 @@ static int sort_by_size = 0;      /* Sort by size of symbol.  */
 static int undefined_only = 0; /* Print undefined symbols only.  */
 static int dynamic = 0;                /* Print dynamic symbols.  */
 static int show_version = 0;   /* Show the version number.  */
 static int undefined_only = 0; /* Print undefined symbols only.  */
 static int dynamic = 0;                /* Print dynamic symbols.  */
 static int show_version = 0;   /* Show the version number.  */

-static int show_stats = 0;     /* Show statistics.  */
+static int show_synthetic = 0; /* Display synthesized symbols too.  */

 static int line_numbers = 0;   /* Print line numbers for symbols.  */
 static int line_numbers = 0;   /* Print line numbers for symbols.  */

+static int allow_special_symbols = 0;  /* Allow special symbols.  */
+static int with_symbol_versions = 0; /* Include symbol version information in the output.  */
+
+static int demangle_flags = DMGL_ANSI | DMGL_PARAMS;

 
 /* When to print the names of files.  Not mutually exclusive in SYSV format.  */
 static int filename_per_file = 0;      /* Once per file, on its own line.  */
 static int filename_per_symbol = 0;    /* Once per symbol, at start of line.  */
 
 
 /* When to print the names of files.  Not mutually exclusive in SYSV format.  */
 static int filename_per_file = 0;      /* Once per file, on its own line.  */
 static int filename_per_symbol = 0;    /* Once per symbol, at start of line.  */
 

-/* Print formats for printing a symbol value.  */
-#ifndef BFD64
-static char value_format[] = "%08lx";
-#else
-#if BFD_HOST_64BIT_LONG
-static char value_format[] = "%016lx";
-#else
-/* We don't use value_format for this case.  */
-#endif
-#endif
-#ifdef BFD64
-static int print_width = 16;
-#else
-static int print_width = 8;
-#endif
+static int print_width = 0;

 static int print_radix = 16;
 /* Print formats for printing stab info.  */
 static char other_format[] = "%02x";
 static char desc_format[] = "%04x";
 
 static char *target = NULL;
 static int print_radix = 16;
 /* Print formats for printing stab info.  */
 static char other_format[] = "%02x";
 static char desc_format[] = "%04x";
 
 static char *target = NULL;

+#if BFD_SUPPORTS_PLUGINS
+static const char *plugin_target = "plugin";
+#else
+static const char *plugin_target = NULL;
+#endif

 
 /* Used to cache the line numbers for a BFD.  */
 static bfd *lineno_cache_bfd;
 static bfd *lineno_cache_rel_bfd;
 
 
 /* Used to cache the line numbers for a BFD.  */
 static bfd *lineno_cache_bfd;
 static bfd *lineno_cache_rel_bfd;
 

-#define OPTION_TARGET 200
+enum long_option_values
+{
+  OPTION_TARGET = 200,
+  OPTION_PLUGIN,
+  OPTION_SIZE_SORT,
+  OPTION_RECURSE_LIMIT,
+  OPTION_NO_RECURSE_LIMIT
+};

 
 static struct option long_options[] =
 {
 
 static struct option long_options[] =
 {


@@ -219,29 +206,34 @@ static struct option long_options[] =
   {"line-numbers", no_argument, 0, 'l'},
   {"no-cplus", no_argument, &do_demangle, 0},  /* Linux compatibility.  */
   {"no-demangle", no_argument, &do_demangle, 0},
   {"line-numbers", no_argument, 0, 'l'},
   {"no-cplus", no_argument, &do_demangle, 0},  /* Linux compatibility.  */
   {"no-demangle", no_argument, &do_demangle, 0},

-  {"no-sort", no_argument, &no_sort, 1},
-  {"numeric-sort", no_argument, &sort_numerically, 1},
+  {"no-recurse-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
+  {"no-recursion-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT},
+  {"no-sort", no_argument, 0, 'p'},
+  {"numeric-sort", no_argument, 0, 'n'},
+  {"plugin", required_argument, 0, OPTION_PLUGIN},

   {"portability", no_argument, 0, 'P'},
   {"print-armap", no_argument, &print_armap, 1},
   {"print-file-name", no_argument, 0, 'o'},
   {"print-size", no_argument, 0, 'S'},
   {"radix", required_argument, 0, 't'},
   {"portability", no_argument, 0, 'P'},
   {"print-armap", no_argument, &print_armap, 1},
   {"print-file-name", no_argument, 0, 'o'},
   {"print-size", no_argument, 0, 'S'},
   {"radix", required_argument, 0, 't'},

+  {"recurse-limit", no_argument, NULL, OPTION_RECURSE_LIMIT},
+  {"recursion-limit", no_argument, NULL, OPTION_RECURSE_LIMIT},

   {"reverse-sort", no_argument, &reverse_sort, 1},
   {"reverse-sort", no_argument, &reverse_sort, 1},

-  {"size-sort", no_argument, &sort_by_size, 1},
-  {"stats", no_argument, &show_stats, 1},
+  {"size-sort", no_argument, 0, OPTION_SIZE_SORT},
+  {"special-syms", no_argument, &allow_special_symbols, 1},
+  {"synthetic", no_argument, &show_synthetic, 1},

   {"target", required_argument, 0, OPTION_TARGET},
   {"defined-only", no_argument, &defined_only, 1},
   {"undefined-only", no_argument, &undefined_only, 1},
   {"version", no_argument, &show_version, 1},
   {"target", required_argument, 0, OPTION_TARGET},
   {"defined-only", no_argument, &defined_only, 1},
   {"undefined-only", no_argument, &undefined_only, 1},
   {"version", no_argument, &show_version, 1},

+  {"with-symbol-versions", no_argument, &with_symbol_versions, 1},

   {0, no_argument, 0, 0}
 };
 \f
 /* Some error-reporting functions.  */
 
   {0, no_argument, 0, 0}
 };
 \f
 /* Some error-reporting functions.  */
 

-static void
-usage (stream, status)
-     FILE *stream;
-     int status;
+ATTRIBUTE_NORETURN static void
+usage (FILE *stream, int status)

 {
   fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name);
   fprintf (stream, _(" List symbols in [file(s)] (a.out by default).\n"));
 {
   fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name);
   fprintf (stream, _(" List symbols in [file(s)] (a.out by default).\n"));


@@ -251,8 +243,11 @@ usage (stream, status)
   -B                     Same as --format=bsd\n\
   -C, --demangle[=STYLE] Decode low-level symbol names into user-level names\n\
                           The STYLE, if specified, can be `auto' (the default),\n\
   -B                     Same as --format=bsd\n\
   -C, --demangle[=STYLE] Decode low-level symbol names into user-level names\n\
                           The STYLE, if specified, can be `auto' (the default),\n\

-                          `gnu', 'lucid', 'arm', 'hp', 'edg' or 'gnu-v3'\n\
+                          `gnu', `lucid', `arm', `hp', `edg', `gnu-v3', `java'\n\
+                          or `gnat'\n\

       --no-demangle      Do not demangle low-level symbol names\n\
       --no-demangle      Do not demangle low-level symbol names\n\

+      --recurse-limit    Enable a demangling recursion limit.  This is the default.\n\
+      --no-recurse-limit Disable a demangling recursion limit.\n\

   -D, --dynamic          Display dynamic symbols instead of normal symbols\n\
       --defined-only     Display only defined symbols\n\
   -e                     (ignored)\n\
   -D, --dynamic          Display dynamic symbols instead of normal symbols\n\
       --defined-only     Display only defined symbols\n\
   -e                     (ignored)\n\


@@ -265,19 +260,28 @@ usage (stream, status)
   -o                     Same as -A\n\
   -p, --no-sort          Do not sort the symbols\n\
   -P, --portability      Same as --format=posix\n\
   -o                     Same as -A\n\
   -p, --no-sort          Do not sort the symbols\n\
   -P, --portability      Same as --format=posix\n\

-  -r, --reverse-sort     Reverse the sense of the sort\n\
+  -r, --reverse-sort     Reverse the sense of the sort\n"));
+#if BFD_SUPPORTS_PLUGINS
+  fprintf (stream, _("\
+      --plugin NAME      Load the specified plugin\n"));
+#endif
+  fprintf (stream, _("\

   -S, --print-size       Print size of defined symbols\n\
   -s, --print-armap      Include index for symbols from archive members\n\
       --size-sort        Sort symbols by size\n\
   -S, --print-size       Print size of defined symbols\n\
   -s, --print-armap      Include index for symbols from archive members\n\
       --size-sort        Sort symbols by size\n\

+      --special-syms     Include special symbols in the output\n\
+      --synthetic        Display synthetic symbols as well\n\

   -t, --radix=RADIX      Use RADIX for printing symbol values\n\
       --target=BFDNAME   Specify the target object format as BFDNAME\n\
   -u, --undefined-only   Display only undefined symbols\n\
   -t, --radix=RADIX      Use RADIX for printing symbol values\n\
       --target=BFDNAME   Specify the target object format as BFDNAME\n\
   -u, --undefined-only   Display only undefined symbols\n\

+      --with-symbol-versions  Display version strings after symbol names\n\

   -X 32_64               (ignored)\n\
   -X 32_64               (ignored)\n\

+  @FILE                  Read options from FILE\n\

   -h, --help             Display this information\n\
   -V, --version          Display this program's version number\n\
 \n"));
   list_supported_targets (program_name, stream);
   -h, --help             Display this information\n\
   -V, --version          Display this program's version number\n\
 \n"));
   list_supported_targets (program_name, stream);

-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)

     fprintf (stream, _("Report bugs to %s.\n"), REPORT_BUGS_TO);
   exit (status);
 }
     fprintf (stream, _("Report bugs to %s.\n"), REPORT_BUGS_TO);
   exit (status);
 }


@@ -285,39 +289,23 @@ usage (stream, status)
 /* Set the radix for the symbol value and size according to RADIX.  */
 
 static void
 /* Set the radix for the symbol value and size according to RADIX.  */
 
 static void

-set_print_radix (radix)
-     char *radix;
+set_print_radix (char *radix)

 {
   switch (*radix)
     {
 {
   switch (*radix)
     {

-    case 'x':
-      break;
-    case 'd':
-    case 'o':
-      if (*radix == 'd')
-       print_radix = 10;
-      else
-       print_radix = 8;
-#ifndef BFD64
-      value_format[4] = *radix;
-#else
-#if BFD_HOST_64BIT_LONG
-      value_format[5] = *radix;
-#else
-      /* This case requires special handling for octal and decimal
-         printing.  */
-#endif
-#endif
-      other_format[3] = desc_format[3] = *radix;
-      break;
+    case 'x': print_radix = 16; break;
+    case 'd': print_radix = 10; break;
+    case 'o': print_radix =  8; break;
+

     default:
       fatal (_("%s: invalid radix"), radix);
     }
     default:
       fatal (_("%s: invalid radix"), radix);
     }

+
+  other_format[3] = desc_format[3] = *radix;

 }
 
 static void
 }
 
 static void

-set_output_format (f)
-     char *f;
+set_output_format (char *f)

 {
   int i;
 
 {
   int i;
 


@@ -339,311 +327,225 @@ set_output_format (f)
       fatal (_("%s: invalid output format"), f);
     }
   format = &formats[i];
       fatal (_("%s: invalid output format"), f);
     }
   format = &formats[i];

+  print_format = i;

 }
 \f
 }
 \f

-int main PARAMS ((int, char **));
-
-int
-main (argc, argv)
-     int argc;
-     char **argv;
+static const char *
+get_elf_symbol_type (unsigned int type)

 {
 {

-  int c;
-  int retval;
+  static char *bufp;
+  int n;

 
 

-#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
-  setlocale (LC_MESSAGES, "");
-#endif
-#if defined (HAVE_SETLOCALE)
-  setlocale (LC_CTYPE, "");
-  setlocale (LC_COLLATE, "");
-#endif
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  program_name = *argv;
-  xmalloc_set_program_name (program_name);
-
-  START_PROGRESS (program_name, 0);
-
-  bfd_init ();
-  set_default_bfd_target ();
-
-  while ((c = getopt_long (argc, argv, "aABCDef:gHhlnopPrSst:uvVvX:",
-                          long_options, (int *) 0)) != EOF)
+  switch (type)

     {
     {

-      switch (c)
-       {
-       case 'a':
-         print_debug_syms = 1;
-         break;
-       case 'A':
-       case 'o':
-         filename_per_symbol = 1;
-         break;
-       case 'B':               /* For MIPS compatibility.  */
-         set_output_format ("bsd");
-         break;
-       case 'C':
-         do_demangle = 1;
-         if (optarg != NULL)
-           {
-             enum demangling_styles style;
-
-             style = cplus_demangle_name_to_style (optarg);
-             if (style == unknown_demangling)
-               fatal (_("unknown demangling style `%s'"),
-                      optarg);
-
-             cplus_demangle_set_style (style);
-           }
-         break;
-       case 'D':
-         dynamic = 1;
-         break;
-       case 'e':
-         /* Ignored for HP/UX compatibility.  */
-         break;
-       case 'f':
-         set_output_format (optarg);
-         break;
-       case 'g':
-         external_only = 1;
-         break;
-       case 'H':
-       case 'h':
-         usage (stdout, 0);
-       case 'l':
-         line_numbers = 1;
-         break;
-       case 'n':
-       case 'v':
-         sort_numerically = 1;
-         break;
-       case 'p':
-         no_sort = 1;
-         break;
-       case 'P':
-         set_output_format ("posix");
-         break;
-       case 'r':
-         reverse_sort = 1;
-         break;
-       case 's':
-         print_armap = 1;
-         break;
-       case 'S':
-         print_size = 1;
-         break;
-       case 't':
-         set_print_radix (optarg);
-         break;
-       case 'u':
-         undefined_only = 1;
-         break;
-       case 'V':
-         show_version = 1;
-         break;
-       case 'X':
-         /* Ignored for (partial) AIX compatibility.  On AIX, the
-            argument has values 32, 64, or 32_64, and specfies that
-            only 32-bit, only 64-bit, or both kinds of objects should
-            be examined.  The default is 32.  So plain AIX nm on a
-            library archive with both kinds of objects will ignore
-            the 64-bit ones.  For GNU nm, the default is and always
-            has been -X 32_64, and other options are not supported.  */
-         if (strcmp (optarg, "32_64") != 0)
-           fatal (_("Only -X 32_64 is supported"));
-         break;
-
-       case OPTION_TARGET:     /* --target */
-         target = optarg;
-         break;
-
-       case 0:         /* A long option that just sets a flag.  */
-         break;
-
-       default:
-         usage (stderr, 1);
-       }
+    case STT_NOTYPE:   return "NOTYPE";
+    case STT_OBJECT:   return "OBJECT";
+    case STT_FUNC:     return "FUNC";
+    case STT_SECTION:  return "SECTION";
+    case STT_FILE:     return "FILE";
+    case STT_COMMON:   return "COMMON";
+    case STT_TLS:      return "TLS";

     }
 
     }
 

-  if (show_version)
-    print_version ("nm");
+  free (bufp);
+  if (type >= STT_LOPROC && type <= STT_HIPROC)
+    n = asprintf (&bufp, _("<processor specific>: %d"), type);
+  else if (type >= STT_LOOS && type <= STT_HIOS)
+    n = asprintf (&bufp, _("<OS specific>: %d"), type);
+  else
+    n = asprintf (&bufp, _("<unknown>: %d"), type);
+  if (n < 0)
+    fatal ("%s", xstrerror (errno));
+  return bufp;
+}

 
 

-  /* OK, all options now parsed.  If no filename specified, do a.out.  */
-  if (optind == argc)
-    return !display_file ("a.out");
+static const char *
+get_coff_symbol_type (const struct internal_syment *sym)
+{
+  static char *bufp;
+  int n;

 
 

-  retval = 0;
+  switch (sym->n_sclass)
+    {
+    case C_BLOCK: return "Block";
+    case C_FILE:  return "File";
+    case C_LINE:  return "Line";
+    }

 
 

-  if (argc - optind > 1)
-    filename_per_file = 1;
+  if (!sym->n_type)
+    return "None";

 
 

-  /* We were given several filenames to do.  */
-  while (optind < argc)
+  switch (DTYPE(sym->n_type))

     {
     {

-      PROGRESS (1);
-      if (!display_file (argv[optind++]))
-       retval++;
+    case DT_FCN: return "Function";
+    case DT_PTR: return "Pointer";
+    case DT_ARY: return "Array";

     }
 
     }
 

-  END_PROGRESS (program_name);
+  free (bufp);
+  n = asprintf (&bufp, _("<unknown>: %d/%d"), sym->n_sclass, sym->n_type);
+  if (n < 0)
+    fatal ("%s", xstrerror (errno));
+  return bufp;
+}
+\f
+/* Print symbol name NAME, read from ABFD, with printf format FORM,
+   demangling it if requested.  */

 
 

-#ifdef HAVE_SBRK
-  if (show_stats)
+static void
+print_symname (const char *form, struct extended_symbol_info *info,
+              const char *name, bfd *abfd)
+{
+  if (name == NULL)
+    name = info->sinfo->name;
+  if (do_demangle && *name)

     {
     {

-      char *lim = (char *) sbrk (0);
+      char *res = bfd_demangle (abfd, name, demangle_flags);

 
 

-      non_fatal (_("data size %ld"), (long) (lim - (char *) &environ));
+      if (res != NULL)
+       {
+         printf (form, res);
+         free (res);
+         return;
+       }

     }
     }

-#endif

 
 

-  exit (retval);
-  return retval;
+  printf (form, name);
+  if (info != NULL && info->elfinfo)
+    {
+      const char *version_string;
+      bfd_boolean hidden;
+
+      version_string
+       = bfd_get_symbol_version_string (abfd, &info->elfinfo->symbol,
+                                        FALSE, &hidden);
+      if (version_string && version_string[0])
+       printf ("%s%s", hidden ? "@" : "@@", version_string);
+    }

 }
 }

-\f
-static const char *
-get_symbol_type (type)
-     unsigned int type;
+
+static void
+print_symdef_entry (bfd *abfd)

 {
 {

-  static char buff [32];
+  symindex idx = BFD_NO_MORE_SYMBOLS;
+  carsym *thesym;
+  bfd_boolean everprinted = FALSE;

 
 

-  switch (type)
+  for (idx = bfd_get_next_mapent (abfd, idx, &thesym);
+       idx != BFD_NO_MORE_SYMBOLS;
+       idx = bfd_get_next_mapent (abfd, idx, &thesym))

     {
     {

-    case STT_NOTYPE:   return "NOTYPE";
-    case STT_OBJECT:   return "OBJECT";
-    case STT_FUNC:     return "FUNC";
-    case STT_SECTION:  return "SECTION";
-    case STT_FILE:     return "FILE";
-    case STT_COMMON:   return "COMMON";
-    case STT_TLS:      return "TLS";
-    default:
-      if (type >= STT_LOPROC && type <= STT_HIPROC)
-       sprintf (buff, _("<processor specific>: %d"), type);
-      else if (type >= STT_LOOS && type <= STT_HIOS)
-       sprintf (buff, _("<OS specific>: %d"), type);
-      else
-       sprintf (buff, _("<unknown>: %d"), type);
-      return buff;
+      bfd *elt;
+      if (!everprinted)
+       {
+         printf (_("\nArchive index:\n"));
+         everprinted = TRUE;
+       }
+      elt = bfd_get_elt_at_index (abfd, idx);
+      if (elt == NULL)
+       bfd_fatal ("bfd_get_elt_at_index");
+      if (thesym->name != (char *) NULL)
+       {
+         print_symname ("%s", NULL, thesym->name, abfd);
+         printf (" in %s\n", bfd_get_filename (elt));
+       }

     }
 }
     }
 }

+\f

 
 

-static void
-display_archive (file)
-     bfd *file;
+/* True when we can report missing plugin error.  */
+bfd_boolean report_plugin_err = TRUE;
+
+/* Choose which symbol entries to print;
+   compact them downward to get rid of the rest.
+   Return the number of symbols to be printed.  */
+
+static long
+filter_symbols (bfd *abfd, bfd_boolean is_dynamic, void *minisyms,
+               long symcount, unsigned int size)

 {
 {

-  bfd *arfile = NULL;
-  bfd *last_arfile = NULL;
-  char **matching;
+  bfd_byte *from, *fromend, *to;
+  asymbol *store;

 
 

-  (*format->print_archive_filename) (bfd_get_filename (file));
+  store = bfd_make_empty_symbol (abfd);
+  if (store == NULL)
+    bfd_fatal (bfd_get_filename (abfd));

 
 

-  if (print_armap)
-    print_symdef_entry (file);
+  from = (bfd_byte *) minisyms;
+  fromend = from + symcount * size;
+  to = (bfd_byte *) minisyms;

 
 

-  for (;;)
+  for (; from < fromend; from += size)

     {
     {

+      int keep = 0;
+      asymbol *sym;
+

       PROGRESS (1);
 
       PROGRESS (1);
 

-      arfile = bfd_openr_next_archived_file (file, arfile);
+      sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, (const void *) from, store);
+      if (sym == NULL)
+       bfd_fatal (bfd_get_filename (abfd));

 
 

-      if (arfile == NULL)
+      if (sym->name[0] == '_'
+         && sym->name[1] == '_'
+         && strcmp (sym->name + (sym->name[2] == '_'), "__gnu_lto_slim") == 0
+         && report_plugin_err)

        {
        {

-         if (bfd_get_error () != bfd_error_no_more_archived_files)
-           bfd_fatal (bfd_get_filename (file));
-         break;
+         report_plugin_err = FALSE;
+         non_fatal (_("%s: plugin needed to handle lto object"),
+                    bfd_get_filename (abfd));

        }
 
        }
 

-      if (bfd_check_format_matches (arfile, bfd_object, &matching))
-       {
-         char buf[30];
-
-         bfd_sprintf_vma (arfile, buf, (bfd_vma) -1);
-         print_width = strlen (buf);
-         (*format->print_archive_member) (bfd_get_filename (file),
-                                          bfd_get_filename (arfile));
-         display_rel_file (arfile, file);
-       }
+      if (undefined_only)
+       keep = bfd_is_und_section (sym->section);
+      else if (external_only)
+       /* PR binutls/12753: Unique symbols are global too.  */
+       keep = ((sym->flags & (BSF_GLOBAL
+                              | BSF_WEAK
+                              | BSF_GNU_UNIQUE)) != 0
+               || bfd_is_und_section (sym->section)
+               || bfd_is_com_section (sym->section));

       else
       else

-       {
-         bfd_nonfatal (bfd_get_filename (arfile));
-         if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
-           {
-             list_matching_formats (matching);
-             free (matching);
-           }
-       }
-
-      if (last_arfile != NULL)
-       {
-         bfd_close (last_arfile);
-         lineno_cache_bfd = NULL;
-         lineno_cache_rel_bfd = NULL;
-       }
-      last_arfile = arfile;
-    }
+       keep = 1;

 
 

-  if (last_arfile != NULL)
-    {
-      bfd_close (last_arfile);
-      lineno_cache_bfd = NULL;
-      lineno_cache_rel_bfd = NULL;
-    }
-}
+      if (keep
+         && ! print_debug_syms
+         && (sym->flags & BSF_DEBUGGING) != 0)
+       keep = 0;

 
 

-static boolean
-display_file (filename)
-     char *filename;
-{
-  boolean retval = true;
-  bfd *file;
-  char **matching;
+      if (keep
+         && sort_by_size
+         && (bfd_is_abs_section (sym->section)
+             || bfd_is_und_section (sym->section)))
+       keep = 0;

 
 

-  file = bfd_openr (filename, target);
-  if (file == NULL)
-    {
-      bfd_nonfatal (filename);
-      return false;
-    }
+      if (keep
+         && defined_only)
+       {
+         if (bfd_is_und_section (sym->section))
+           keep = 0;
+       }

 
 

-  if (bfd_check_format (file, bfd_archive))
-    {
-      display_archive (file);
-    }
-  else if (bfd_check_format_matches (file, bfd_object, &matching))
-    {
-      char buf[30];
+      if (keep
+         && bfd_is_target_special_symbol (abfd, sym)
+         && ! allow_special_symbols)
+       keep = 0;

 
 

-      bfd_sprintf_vma (file, buf, (bfd_vma) -1);
-      print_width = strlen (buf);
-      (*format->print_object_filename) (filename);
-      display_rel_file (file, NULL);
-    }
-  else
-    {
-      bfd_nonfatal (filename);
-      if (bfd_get_error () == bfd_error_file_ambiguously_recognized)
+      if (keep)

        {
        {

-         list_matching_formats (matching);
-         free (matching);
+         if (to != from)
+           memcpy (to, from, size);
+         to += size;

        }
        }

-      retval = false;

     }
 
     }
 

-  if (bfd_close (file) == false)
-    bfd_fatal (filename);
-
-  lineno_cache_bfd = NULL;
-  lineno_cache_rel_bfd = NULL;
-
-  return retval;
+  return (to - (bfd_byte *) minisyms) / size;

 }
 \f
 /* These globals are used to pass information into the sorting
    routines.  */
 static bfd *sort_bfd;
 }
 \f
 /* These globals are used to pass information into the sorting
    routines.  */
 static bfd *sort_bfd;

-static boolean sort_dynamic;
+static bfd_boolean sort_dynamic;

 static asymbol *sort_x;
 static asymbol *sort_y;
 
 static asymbol *sort_x;
 static asymbol *sort_y;
 


@@ -655,46 +557,7 @@ static asymbol *sort_y;
    specially -- i.e., their sizes are used as their "values".  */
 
 static int
    specially -- i.e., their sizes are used as their "values".  */
 
 static int

-numeric_forward (P_x, P_y)
-     const PTR P_x;
-     const PTR P_y;
-{
-  asymbol *x, *y;
-  asection *xs, *ys;
-
-  x = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_x, sort_x);
-  y =  bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_y, sort_y);
-  if (x == NULL || y == NULL)
-    bfd_fatal (bfd_get_filename (sort_bfd));
-
-  xs = bfd_get_section (x);
-  ys = bfd_get_section (y);
-
-  if (bfd_is_und_section (xs))
-    {
-      if (! bfd_is_und_section (ys))
-       return -1;
-    }
-  else if (bfd_is_und_section (ys))
-    return 1;
-  else if (valueof (x) != valueof (y))
-    return valueof (x) < valueof (y) ? -1 : 1;
-
-  return non_numeric_forward (P_x, P_y);
-}
-
-static int
-numeric_reverse (x, y)
-     const PTR x;
-     const PTR y;
-{
-  return - numeric_forward (x, y);
-}
-
-static int
-non_numeric_forward (P_x, P_y)
-     const PTR P_x;
-     const PTR P_y;
+non_numeric_forward (const void *P_x, const void *P_y)

 {
   asymbol *x, *y;
   const char *xn, *yn;
 {
   asymbol *x, *y;
   const char *xn, *yn;


@@ -727,14 +590,45 @@ non_numeric_forward (P_x, P_y)
 }
 
 static int
 }
 
 static int

-non_numeric_reverse (x, y)
-     const PTR x;
-     const PTR y;
+non_numeric_reverse (const void *x, const void *y)

 {
   return - non_numeric_forward (x, y);
 }
 
 {
   return - non_numeric_forward (x, y);
 }
 

-static int (*(sorters[2][2])) PARAMS ((const PTR, const PTR)) =
+static int
+numeric_forward (const void *P_x, const void *P_y)
+{
+  asymbol *x, *y;
+  asection *xs, *ys;
+
+  x = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_x, sort_x);
+  y =  bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_y, sort_y);
+  if (x == NULL || y == NULL)
+    bfd_fatal (bfd_get_filename (sort_bfd));
+
+  xs = bfd_asymbol_section (x);
+  ys = bfd_asymbol_section (y);
+
+  if (bfd_is_und_section (xs))
+    {
+      if (! bfd_is_und_section (ys))
+       return -1;
+    }
+  else if (bfd_is_und_section (ys))
+    return 1;
+  else if (valueof (x) != valueof (y))
+    return valueof (x) < valueof (y) ? -1 : 1;
+
+  return non_numeric_forward (P_x, P_y);
+}
+
+static int
+numeric_reverse (const void *x, const void *y)
+{
+  return - numeric_forward (x, y);
+}
+
+static int (*(sorters[2][2])) (const void *, const void *) =

 {
   { non_numeric_forward, non_numeric_reverse },
   { numeric_forward, numeric_reverse }
 {
   { non_numeric_forward, non_numeric_reverse },
   { numeric_forward, numeric_reverse }


@@ -752,9 +646,7 @@ static int (*(sorters[2][2])) PARAMS ((const PTR, const PTR)) =
    value.  */
 
 static int
    value.  */
 
 static int

-size_forward1 (P_x, P_y)
-     const PTR P_x;
-     const PTR P_y;
+size_forward1 (const void *P_x, const void *P_y)

 {
   asymbol *x, *y;
   asection *xs, *ys;
 {
   asymbol *x, *y;
   asection *xs, *ys;


@@ -767,8 +659,8 @@ size_forward1 (P_x, P_y)
   if (x == NULL || y == NULL)
     bfd_fatal (bfd_get_filename (sort_bfd));
 
   if (x == NULL || y == NULL)
     bfd_fatal (bfd_get_filename (sort_bfd));
 

-  xs = bfd_get_section (x);
-  ys = bfd_get_section (y);
+  xs = bfd_asymbol_section (x);
+  ys = bfd_asymbol_section (y);

 
   if (bfd_is_und_section (xs))
     abort ();
 
   if (bfd_is_und_section (xs))
     abort ();


@@ -805,7 +697,8 @@ size_forward1 (P_x, P_y)
 
 #define file_symbol(s, sn, snl)                        \
   (((s)->flags & BSF_FILE) != 0                        \
 
 #define file_symbol(s, sn, snl)                        \
   (((s)->flags & BSF_FILE) != 0                        \

-   || ((sn)[(snl) - 2] == '.'                  \
+   || ((snl) > 2                               \
+       && (sn)[(snl) - 2] == '.'               \

        && ((sn)[(snl) - 1] == 'o'              \
           || (sn)[(snl) - 1] == 'a')))
 
        && ((sn)[(snl) - 1] == 'o'              \
           || (sn)[(snl) - 1] == 'a')))
 


@@ -824,9 +717,7 @@ size_forward1 (P_x, P_y)
    an array of size_sym structures into size order.  */
 
 static int
    an array of size_sym structures into size order.  */
 
 static int

-size_forward2 (P_x, P_y)
-     const PTR P_x;
-     const PTR P_y;
+size_forward2 (const void *P_x, const void *P_y)

 {
   const struct size_sym *x = (const struct size_sym *) P_x;
   const struct size_sym *y = (const struct size_sym *) P_y;
 {
   const struct size_sym *x = (const struct size_sym *) P_x;
   const struct size_sym *y = (const struct size_sym *) P_y;


@@ -845,13 +736,9 @@ size_forward2 (P_x, P_y)
    size.  */
 
 static long
    size.  */
 
 static long

-sort_symbols_by_size (abfd, dynamic, minisyms, symcount, size, symsizesp)
-     bfd *abfd;
-     boolean dynamic;
-     PTR minisyms;
-     long symcount;
-     unsigned int size;
-     struct size_sym **symsizesp;
+sort_symbols_by_size (bfd *abfd, bfd_boolean is_dynamic, void *minisyms,
+                     long symcount, unsigned int size,
+                     struct size_sym **symsizesp)

 {
   struct size_sym *symsizes;
   bfd_byte *from, *fromend;
 {
   struct size_sym *symsizes;
   bfd_byte *from, *fromend;


@@ -876,7 +763,7 @@ sort_symbols_by_size (abfd, dynamic, minisyms, symcount, size, symsizesp)
 
   if (from < fromend)
     {
 
   if (from < fromend)
     {

-      sym = bfd_minisymbol_to_symbol (abfd, dynamic, (const PTR) from,
+      sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, (const void *) from,

                                      store_sym);
       if (sym == NULL)
        bfd_fatal (bfd_get_filename (abfd));
                                      store_sym);
       if (sym == NULL)
        bfd_fatal (bfd_get_filename (abfd));


@@ -892,8 +779,8 @@ sort_symbols_by_size (abfd, dynamic, minisyms, symcount, size, symsizesp)
       if (from + size < fromend)
        {
          next = bfd_minisymbol_to_symbol (abfd,
       if (from + size < fromend)
        {
          next = bfd_minisymbol_to_symbol (abfd,

-                                          dynamic,
-                                          (const PTR) (from + size),
+                                          is_dynamic,
+                                          (const void *) (from + size),

                                           store_next);
          if (next == NULL)
            bfd_fatal (bfd_get_filename (abfd));
                                           store_next);
          if (next == NULL)
            bfd_fatal (bfd_get_filename (abfd));


@@ -901,26 +788,31 @@ sort_symbols_by_size (abfd, dynamic, minisyms, symcount, size, symsizesp)
       else
        next = NULL;
 
       else
        next = NULL;
 

-      sec = bfd_get_section (sym);
+      sec = bfd_asymbol_section (sym);

 
 

-      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+      /* Synthetic symbols don't have a full type set of data available, thus
+        we can't rely on that information for the symbol size.  Ditto for
+        bfd/section.c:global_syms like *ABS*.  */
+      if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0
+         && bfd_get_flavour (abfd) == bfd_target_elf_flavour)

        sz = ((elf_symbol_type *) sym)->internal_elf_sym.st_size;
        sz = ((elf_symbol_type *) sym)->internal_elf_sym.st_size;

-      else if (bfd_is_com_section (sec))
+      else if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0
+              && bfd_is_com_section (sec))

        sz = sym->value;
       else
        {
          if (from + size < fromend
        sz = sym->value;
       else
        {
          if (from + size < fromend

-             && sec == bfd_get_section (next))
+             && sec == bfd_asymbol_section (next))

            sz = valueof (next) - valueof (sym);
          else
            sz = valueof (next) - valueof (sym);
          else

-           sz = (bfd_get_section_vma (abfd, sec)
-                 + bfd_section_size (abfd, sec)
+           sz = (bfd_section_vma (sec)
+                 + bfd_section_size (sec)

                  - valueof (sym));
        }
 
       if (sz != 0)
        {
                  - valueof (sym));
        }
 
       if (sz != 0)
        {

-         symsizes->minisym = (const PTR) from;
+         symsizes->minisym = (const void *) from;

          symsizes->size = sz;
          ++symsizes;
        }
          symsizes->size = sz;
          ++symsizes;
        }


@@ -935,181 +827,262 @@ sort_symbols_by_size (abfd, dynamic, minisyms, symcount, size, symsizesp)
   symcount = symsizes - *symsizesp;
 
   /* We must now sort again by size.  */
   symcount = symsizes - *symsizesp;
 
   /* We must now sort again by size.  */

-  qsort ((PTR) *symsizesp, symcount, sizeof (struct size_sym), size_forward2);
+  qsort ((void *) *symsizesp, symcount, sizeof (struct size_sym), size_forward2);

 
   return symcount;
 }
 
   return symcount;
 }

-\f
-/* If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD.  */
+
+/* This function is used to get the relocs for a particular section.
+   It is called via bfd_map_over_sections.  */

 
 static void
 
 static void

-display_rel_file (abfd, archive_bfd)
-     bfd *abfd;
-     bfd *archive_bfd;
+get_relocs (bfd *abfd, asection *sec, void *dataarg)

 {
 {

-  long symcount;
-  PTR minisyms;
-  unsigned int size;
-  struct size_sym *symsizes;
-
-  if (! dynamic)
-    {
-      if (!(bfd_get_file_flags (abfd) & HAS_SYMS))
-       {
-         non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));
-         return;
-       }
-    }
+  struct get_relocs_info *data = (struct get_relocs_info *) dataarg;

 
 

-  symcount = bfd_read_minisymbols (abfd, dynamic, &minisyms, &size);
-  if (symcount < 0)
-    bfd_fatal (bfd_get_filename (abfd));
+  *data->secs = sec;

 
 

-  if (symcount == 0)
+  if ((sec->flags & SEC_RELOC) == 0)

     {
     {

-      non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));
-      return;
+      *data->relocs = NULL;
+      *data->relcount = 0;

     }
     }

-
-  /* Discard the symbols we don't want to print.
-     It's OK to do this in place; we'll free the storage anyway
-     (after printing).  */
-
-  symcount = filter_symbols (abfd, dynamic, minisyms, symcount, size);
-
-  symsizes = NULL;
-  if (! no_sort)
+  else

     {
     {

-      sort_bfd = abfd;
-      sort_dynamic = dynamic;
-      sort_x = bfd_make_empty_symbol (abfd);
-      sort_y = bfd_make_empty_symbol (abfd);
-      if (sort_x == NULL || sort_y == NULL)
+      long relsize;
+
+      relsize = bfd_get_reloc_upper_bound (abfd, sec);
+      if (relsize < 0)

        bfd_fatal (bfd_get_filename (abfd));
 
        bfd_fatal (bfd_get_filename (abfd));
 

-      if (! sort_by_size)
-       qsort (minisyms, symcount, size,
-              sorters[sort_numerically][reverse_sort]);
-      else
-       symcount = sort_symbols_by_size (abfd, dynamic, minisyms, symcount,
-                                        size, &symsizes);
+      *data->relocs = (arelent **) xmalloc (relsize);
+      *data->relcount = bfd_canonicalize_reloc (abfd, sec, *data->relocs,
+                                               data->syms);
+      if (*data->relcount < 0)
+       bfd_fatal (bfd_get_filename (abfd));

     }
 
     }
 

-  if (! sort_by_size)
-    print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd);
-  else
-    print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd);
-
-  free (minisyms);
+  ++data->secs;
+  ++data->relocs;
+  ++data->relcount;

 }
 }

-\f
-/* Choose which symbol entries to print;
-   compact them downward to get rid of the rest.
-   Return the number of symbols to be printed.  */

 
 

-static long
-filter_symbols (abfd, dynamic, minisyms, symcount, size)
-     bfd *abfd;
-     boolean dynamic;
-     PTR minisyms;
-     long symcount;
-     unsigned int size;
+/* Print a single symbol.  */
+
+static void
+print_symbol (bfd *        abfd,
+             asymbol *    sym,
+             bfd_vma      ssize,
+             bfd *        archive_bfd)

 {
 {

-  bfd_byte *from, *fromend, *to;
-  asymbol *store;
+  symbol_info syminfo;
+  struct extended_symbol_info info;

 
 

-  store = bfd_make_empty_symbol (abfd);
-  if (store == NULL)
-    bfd_fatal (bfd_get_filename (abfd));
+  PROGRESS (1);

 
 

-  from = (bfd_byte *) minisyms;
-  fromend = from + symcount * size;
-  to = (bfd_byte *) minisyms;
+  format->print_symbol_filename (archive_bfd, abfd);

 
 

-  for (; from < fromend; from += size)
-    {
-      int keep = 0;
-      asymbol *sym;
+  bfd_get_symbol_info (abfd, sym, &syminfo);

 
 

-      PROGRESS (1);
+  info.sinfo = &syminfo;
+  info.ssize = ssize;
+  /* Synthetic symbols do not have a full symbol type set of data available.
+     Nor do bfd/section.c:global_syms like *ABS*.  */
+  if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) != 0)
+    {
+      info.elfinfo = NULL;
+      info.coffinfo = NULL;
+    }
+  else
+    {
+      info.elfinfo = elf_symbol_from (abfd, sym);
+      info.coffinfo = coff_symbol_from (sym);
+    }

 
 

-      sym = bfd_minisymbol_to_symbol (abfd, dynamic, (const PTR) from, store);
-      if (sym == NULL)
-       bfd_fatal (bfd_get_filename (abfd));
+  format->print_symbol_info (&info, abfd);

 
 

-      if (undefined_only)
-       keep = bfd_is_und_section (sym->section);
-      else if (external_only)
-       keep = ((sym->flags & BSF_GLOBAL) != 0
-               || (sym->flags & BSF_WEAK) != 0
-               || bfd_is_und_section (sym->section)
-               || bfd_is_com_section (sym->section));
-      else
-       keep = 1;
+  if (with_symbol_versions)
+    {
+      const char *  version_string = NULL;
+      bfd_boolean   hidden = FALSE;

 
 

-      if (keep
-         && ! print_debug_syms
-         && (sym->flags & BSF_DEBUGGING) != 0)
-       keep = 0;
+      if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0)
+       version_string = bfd_get_symbol_version_string (abfd, sym,
+                                                       TRUE, &hidden);

 
 

-      if (keep
-         && sort_by_size
-         && (bfd_is_abs_section (sym->section)
-             || bfd_is_und_section (sym->section)))
-       keep = 0;
+      if (bfd_is_und_section (bfd_asymbol_section (sym)))
+       hidden = TRUE;

 
 

-      if (keep
-         && defined_only)
-       {
-         if (bfd_is_und_section (sym->section))
-           keep = 0;
-       }
+      if (version_string && *version_string != '\0')
+       printf (hidden ? "@%s" : "@@%s", version_string);
+    }

 
 

-      if (keep)
+  if (line_numbers)
+    {
+      static asymbol **syms;
+      static long symcount;
+      const char *filename, *functionname;
+      unsigned int lineno;
+
+      /* We need to get the canonical symbols in order to call
+         bfd_find_nearest_line.  This is inefficient, but, then, you
+         don't have to use --line-numbers.  */
+      if (abfd != lineno_cache_bfd && syms != NULL)

        {
        {

-         memcpy (to, from, size);
-         to += size;
+         free (syms);
+         syms = NULL;
+       }
+      if (syms == NULL)
+       {
+         long symsize;
+
+         symsize = bfd_get_symtab_upper_bound (abfd);
+         if (symsize < 0)
+           bfd_fatal (bfd_get_filename (abfd));
+         syms = (asymbol **) xmalloc (symsize);
+         symcount = bfd_canonicalize_symtab (abfd, syms);
+         if (symcount < 0)
+           bfd_fatal (bfd_get_filename (abfd));
+         lineno_cache_bfd = abfd;
+       }
+
+      if (bfd_is_und_section (bfd_asymbol_section (sym)))
+       {
+         static asection **secs;
+         static arelent ***relocs;
+         static long *relcount;
+         static unsigned int seccount;
+         unsigned int i;
+         const char *symname;
+
+         /* For an undefined symbol, we try to find a reloc for the
+             symbol, and print the line number of the reloc.  */
+         if (abfd != lineno_cache_rel_bfd && relocs != NULL)
+           {
+             for (i = 0; i < seccount; i++)
+               if (relocs[i] != NULL)
+                 free (relocs[i]);
+             free (secs);
+             free (relocs);
+             free (relcount);
+             secs = NULL;
+             relocs = NULL;
+             relcount = NULL;
+           }
+
+         if (relocs == NULL)
+           {
+             struct get_relocs_info rinfo;
+
+             seccount = bfd_count_sections (abfd);
+
+             secs = (asection **) xmalloc (seccount * sizeof *secs);
+             relocs = (arelent ***) xmalloc (seccount * sizeof *relocs);
+             relcount = (long *) xmalloc (seccount * sizeof *relcount);
+
+             rinfo.secs = secs;
+             rinfo.relocs = relocs;
+             rinfo.relcount = relcount;
+             rinfo.syms = syms;
+             bfd_map_over_sections (abfd, get_relocs, (void *) &rinfo);
+             lineno_cache_rel_bfd = abfd;
+           }
+
+         symname = bfd_asymbol_name (sym);
+         for (i = 0; i < seccount; i++)
+           {
+             long j;
+
+             for (j = 0; j < relcount[i]; j++)
+               {
+                 arelent *r;
+
+                 r = relocs[i][j];
+                 if (r->sym_ptr_ptr != NULL
+                     && (*r->sym_ptr_ptr)->section == sym->section
+                     && (*r->sym_ptr_ptr)->value == sym->value
+                     && strcmp (symname,
+                                bfd_asymbol_name (*r->sym_ptr_ptr)) == 0
+                     && bfd_find_nearest_line (abfd, secs[i], syms,
+                                               r->address, &filename,
+                                               &functionname, &lineno)
+                     && filename != NULL)
+                   {
+                     /* We only print the first one we find.  */
+                     printf ("\t%s:%u", filename, lineno);
+                     i = seccount;
+                     break;
+                   }
+               }
+           }
+       }
+      else if (bfd_asymbol_section (sym)->owner == abfd)
+       {
+         if ((bfd_find_line (abfd, syms, sym, &filename, &lineno)
+              || bfd_find_nearest_line (abfd, bfd_asymbol_section (sym),
+                                        syms, sym->value, &filename,
+                                        &functionname, &lineno))
+             && filename != NULL
+             && lineno != 0)
+           printf ("\t%s:%u", filename, lineno);

        }
     }
 
        }
     }
 

-  return (to - (bfd_byte *) minisyms) / size;
+  putchar ('\n');

 }
 \f
 }
 \f

-/* Print symbol name NAME, read from ABFD, with printf format FORMAT,
-   demangling it if requested.  */
+/* Print the symbols when sorting by size.  */

 
 static void
 
 static void

-print_symname (format, name, abfd)
-     const char *format;
-     const char *name;
-     bfd *abfd;
+print_size_symbols (bfd *              abfd,
+                   bfd_boolean        is_dynamic,
+                   struct size_sym *  symsizes,
+                   long               symcount,
+                   bfd *              archive_bfd)

 {
 {

-  if (do_demangle && *name)
+  asymbol *store;
+  struct size_sym *from;
+  struct size_sym *fromend;
+
+  store = bfd_make_empty_symbol (abfd);
+  if (store == NULL)
+    bfd_fatal (bfd_get_filename (abfd));
+
+  from = symsizes;
+  fromend = from + symcount;
+
+  for (; from < fromend; from++)

     {
     {

-      char *res = demangle (abfd, name);
+      asymbol *sym;

 
 

-      printf (format, res);
-      free (res);
-      return;
-    }
+      sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, from->minisym, store);
+      if (sym == NULL)
+       bfd_fatal (bfd_get_filename (abfd));

 
 

-  printf (format, name);
+      print_symbol (abfd, sym, from->size, archive_bfd);
+    }

 }
 
 }
 

-/* Print the symbols.  If ARCHIVE_BFD is non-NULL, it is the archive
-   containing ABFD.  */
+\f
+/* Print the symbols of ABFD that are held in MINISYMS.
+
+   If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD.
+
+   SYMCOUNT is the number of symbols in MINISYMS.
+
+   SIZE is the size of a symbol in MINISYMS.  */

 
 static void
 
 static void

-print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd)
-     bfd *abfd;
-     boolean dynamic;
-     PTR minisyms;
-     long symcount;
-     unsigned int size;
-     bfd *archive_bfd;
+print_symbols (bfd *         abfd,
+              bfd_boolean   is_dynamic,
+              void *        minisyms,
+              long          symcount,
+              unsigned int  size,
+              bfd *         archive_bfd)

 {
   asymbol *store;
 {
   asymbol *store;

-  bfd_byte *from, *fromend;
+  bfd_byte *from;
+  bfd_byte *fromend;

 
   store = bfd_make_empty_symbol (abfd);
   if (store == NULL)
 
   store = bfd_make_empty_symbol (abfd);
   if (store == NULL)


@@ -1117,11 +1090,12 @@ print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd)
 
   from = (bfd_byte *) minisyms;
   fromend = from + symcount * size;
 
   from = (bfd_byte *) minisyms;
   fromend = from + symcount * size;

+

   for (; from < fromend; from += size)
     {
       asymbol *sym;
 
   for (; from < fromend; from += size)
     {
       asymbol *sym;
 

-      sym = bfd_minisymbol_to_symbol (abfd, dynamic, from, store);
+      sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, from, store);

       if (sym == NULL)
        bfd_fatal (bfd_get_filename (abfd));
 
       if (sym == NULL)
        bfd_fatal (bfd_get_filename (abfd));
 


@@ -1129,190 +1103,313 @@ print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd)
     }
 }
 
     }
 }
 

-/* Print the symbols when sorting by size.  */
+/* If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD.  */

 
 static void
 
 static void

-print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd)
-     bfd *abfd;
-     boolean dynamic;
-     struct size_sym *symsizes;
-     long symcount;
-     bfd *archive_bfd;
+display_rel_file (bfd *abfd, bfd *archive_bfd)

 {
 {

-  asymbol *store;
-  struct size_sym *from, *fromend;
+  long symcount;
+  void *minisyms;
+  unsigned int size;
+  struct size_sym *symsizes;
+  asymbol *synthsyms = NULL;

 
 

-  store = bfd_make_empty_symbol (abfd);
-  if (store == NULL)
-    bfd_fatal (bfd_get_filename (abfd));
+  if (! dynamic)
+    {
+      if (!(bfd_get_file_flags (abfd) & HAS_SYMS))
+       {
+         non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));
+         return;
+       }
+    }

 
 

-  from = symsizes;
-  fromend = from + symcount;
-  for (; from < fromend; from++)
+  symcount = bfd_read_minisymbols (abfd, dynamic, &minisyms, &size);
+  if (symcount < 0)

     {
     {

-      asymbol *sym;
-      bfd_vma ssize;
+      if (dynamic && bfd_get_error () == bfd_error_no_symbols)
+       {
+         non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));
+         return;
+       }

 
 

-      sym = bfd_minisymbol_to_symbol (abfd, dynamic, from->minisym, store);
-      if (sym == NULL)
-       bfd_fatal (bfd_get_filename (abfd));
+      bfd_fatal (bfd_get_filename (abfd));
+    }
+
+  if (symcount == 0)
+    {
+      non_fatal (_("%s: no symbols"), bfd_get_filename (abfd));
+      return;
+    }
+
+  if (show_synthetic && size == sizeof (asymbol *))
+    {
+      asymbol **static_syms = NULL;
+      asymbol **dyn_syms = NULL;
+      long static_count = 0;
+      long dyn_count = 0;
+      long synth_count;

 
 

-      /* For elf we have already computed the correct symbol size.  */
-      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
-       ssize = from->size;
+      if (dynamic)
+       {
+         dyn_count = symcount;
+         dyn_syms = (asymbol **) minisyms;
+       }

       else
       else

-       ssize = from->size - bfd_section_vma (abfd, bfd_get_section (sym));
+       {
+         long storage = bfd_get_dynamic_symtab_upper_bound (abfd);
+
+         static_count = symcount;
+         static_syms = (asymbol **) minisyms;

 
 

-      print_symbol (abfd, sym, ssize, archive_bfd);
+         if (storage > 0)
+           {
+             dyn_syms = (asymbol **) xmalloc (storage);
+             dyn_count = bfd_canonicalize_dynamic_symtab (abfd, dyn_syms);
+             if (dyn_count < 0)
+               bfd_fatal (bfd_get_filename (abfd));
+           }
+       }
+
+      synth_count = bfd_get_synthetic_symtab (abfd, static_count, static_syms,
+                                             dyn_count, dyn_syms, &synthsyms);
+      if (synth_count > 0)
+       {
+         asymbol **symp;
+         long i;
+
+         minisyms = xrealloc (minisyms,
+                              (symcount + synth_count + 1) * sizeof (*symp));
+         symp = (asymbol **) minisyms + symcount;
+         for (i = 0; i < synth_count; i++)
+           *symp++ = synthsyms + i;
+         *symp = 0;
+         symcount += synth_count;
+       }
+      if (!dynamic && dyn_syms != NULL)
+       free (dyn_syms);

     }
     }

+
+  /* lto_slim_object is set to false when a bfd is loaded with a compiler
+     LTO plugin.  */
+  if (abfd->lto_slim_object)
+    {
+      report_plugin_err = FALSE;
+      non_fatal (_("%s: plugin needed to handle lto object"),
+                bfd_get_filename (abfd));
+    }
+
+  /* Discard the symbols we don't want to print.
+     It's OK to do this in place; we'll free the storage anyway
+     (after printing).  */
+
+  symcount = filter_symbols (abfd, dynamic, minisyms, symcount, size);
+
+  symsizes = NULL;
+  if (! no_sort)
+    {
+      sort_bfd = abfd;
+      sort_dynamic = dynamic;
+      sort_x = bfd_make_empty_symbol (abfd);
+      sort_y = bfd_make_empty_symbol (abfd);
+      if (sort_x == NULL || sort_y == NULL)
+       bfd_fatal (bfd_get_filename (abfd));
+
+      if (! sort_by_size)
+       qsort (minisyms, symcount, size,
+              sorters[sort_numerically][reverse_sort]);
+      else
+       symcount = sort_symbols_by_size (abfd, dynamic, minisyms, symcount,
+                                        size, &symsizes);
+    }
+
+  if (! sort_by_size)
+    print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd);
+  else
+    print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd);
+
+  if (synthsyms)
+    free (synthsyms);
+  free (minisyms);
+  free (symsizes);

 }
 
 }
 

-/* Print a single symbol.  */
+/* Construct a formatting string for printing symbol values.  */

 
 

-static void
-print_symbol (abfd, sym, ssize, archive_bfd)
-     bfd *abfd;
-     asymbol *sym;
-     bfd_vma ssize;
-     bfd *archive_bfd;
+static const char *
+get_print_format (void)

 {
 {

-  PROGRESS (1);
+  const char * padding;
+  if (print_format == FORMAT_POSIX)
+    {
+      /* POSIX compatible output does not have any padding.  */
+      padding = "";
+    }
+  else if (print_width == 32)
+    {
+      padding ="08";
+    }
+  else /* print_width == 64 */
+    {
+      padding = "016";
+    }

 
 

-  (*format->print_symbol_filename) (archive_bfd, abfd);
+  const char * length = "l";
+  if (print_width == 64)
+    {
+#if BFD_HOST_64BIT_LONG
+      ;
+#elif BFD_HOST_64BIT_LONG_LONG
+#ifndef __MSVCRT__
+      length = "ll";
+#else
+      length = "I64";
+#endif
+#endif
+    }

 
 

-  if (undefined_only)
+  const char * radix = NULL;
+  switch (print_radix)

     {
     {

-      if (bfd_is_und_section (bfd_get_section (sym)))
-       print_symname ("%s", bfd_asymbol_name (sym), abfd);
+    case 8:  radix = "o"; break;
+    case 10: radix = "d"; break;
+    case 16: radix = "x"; break;

     }
     }

-  else
+
+  return concat ("%", padding, length, radix, NULL);
+}
+
+static void
+set_print_width (bfd *file)
+{
+  print_width = bfd_get_arch_size (file);
+
+  if (print_width == -1)

     {
     {

-      symbol_info syminfo;
-      struct extended_symbol_info info;
-
-      bfd_get_symbol_info (abfd, sym, &syminfo);
-      info.sinfo = &syminfo;
-      info.ssize = ssize;
-      if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
-       info.elfinfo = (elf_symbol_type *) sym;
+      /* PR binutils/4292
+        Guess the target's bitsize based on its name.
+        We assume here than any 64-bit format will include
+        "64" somewhere in its name.  The only known exception
+        is the MMO object file format.  */
+      if (strstr (bfd_get_target (file), "64") != NULL
+         || strcmp (bfd_get_target (file), "mmo") == 0)
+       print_width = 64;

       else
       else

-       info.elfinfo = NULL;
-      (*format->print_symbol_info) (&info, abfd);
+       print_width = 32;

     }
     }

+  free ((char *) print_format_string);
+  print_format_string = get_print_format ();
+}

 
 

-  if (line_numbers)
+static void
+display_archive (bfd *file)
+{
+  bfd *arfile = NULL;
+  bfd *last_arfile = NULL;
+  char **matching;
+
+  format->print_archive_filename (bfd_get_filename (file));
+
+  if (print_armap)
+    print_symdef_entry (file);
+
+  for (;;)

     {
     {

-      static asymbol **syms;
-      static long symcount;
-      const char *filename, *functionname;
-      unsigned int lineno;
+      PROGRESS (1);

 
 

-      /* We need to get the canonical symbols in order to call
-         bfd_find_nearest_line.  This is inefficient, but, then, you
-         don't have to use --line-numbers.  */
-      if (abfd != lineno_cache_bfd && syms != NULL)
+      arfile = bfd_openr_next_archived_file (file, arfile);
+
+      if (arfile == NULL)

        {
        {

-         free (syms);
-         syms = NULL;
+         if (bfd_get_error () != bfd_error_no_more_archived_files)
+           bfd_fatal (bfd_get_filename (file));
+         break;

        }
        }

-      if (syms == NULL)
-       {
-         long symsize;

 
 

-         symsize = bfd_get_symtab_upper_bound (abfd);
-         if (symsize < 0)
-           bfd_fatal (bfd_get_filename (abfd));
-         syms = (asymbol **) xmalloc (symsize);
-         symcount = bfd_canonicalize_symtab (abfd, syms);
-         if (symcount < 0)
-           bfd_fatal (bfd_get_filename (abfd));
-         lineno_cache_bfd = abfd;
+      if (bfd_check_format_matches (arfile, bfd_object, &matching))
+       {
+         set_print_width (arfile);
+         format->print_archive_member (bfd_get_filename (file),
+                                       bfd_get_filename (arfile));
+         display_rel_file (arfile, file);

        }
        }

-
-      if (bfd_is_und_section (bfd_get_section (sym)))
+      else

        {
        {

-         static asection **secs;
-         static arelent ***relocs;
-         static long *relcount;
-         static unsigned int seccount;
-         unsigned int i;
-         const char *symname;
-
-         /* For an undefined symbol, we try to find a reloc for the
-             symbol, and print the line number of the reloc.  */
-         if (abfd != lineno_cache_rel_bfd && relocs != NULL)
+         bfd_nonfatal (bfd_get_filename (arfile));
+         if (bfd_get_error () == bfd_error_file_ambiguously_recognized)

            {
            {

-             for (i = 0; i < seccount; i++)
-               if (relocs[i] != NULL)
-                 free (relocs[i]);
-             free (secs);
-             free (relocs);
-             free (relcount);
-             secs = NULL;
-             relocs = NULL;
-             relcount = NULL;
+             list_matching_formats (matching);
+             free (matching);

            }
            }

+       }

 
 

-         if (relocs == NULL)
-           {
-             struct get_relocs_info info;
+      if (last_arfile != NULL)
+       {
+         bfd_close (last_arfile);
+         lineno_cache_bfd = NULL;
+         lineno_cache_rel_bfd = NULL;
+         if (arfile == last_arfile)
+           return;
+       }
+      last_arfile = arfile;
+    }

 
 

-             seccount = bfd_count_sections (abfd);
+  if (last_arfile != NULL)
+    {
+      bfd_close (last_arfile);
+      lineno_cache_bfd = NULL;
+      lineno_cache_rel_bfd = NULL;
+    }
+}

 
 

-             secs = (asection **) xmalloc (seccount * sizeof *secs);
-             relocs = (arelent ***) xmalloc (seccount * sizeof *relocs);
-             relcount = (long *) xmalloc (seccount * sizeof *relcount);
+static bfd_boolean
+display_file (char *filename)
+{
+  bfd_boolean retval = TRUE;
+  bfd *file;
+  char **matching;

 
 

-             info.secs = secs;
-             info.relocs = relocs;
-             info.relcount = relcount;
-             info.syms = syms;
-             bfd_map_over_sections (abfd, get_relocs, (PTR) &info);
-             lineno_cache_rel_bfd = abfd;
-           }
+  if (get_file_size (filename) < 1)
+    return FALSE;

 
 

-         symname = bfd_asymbol_name (sym);
-         for (i = 0; i < seccount; i++)
-           {
-             long j;
+  file = bfd_openr (filename, target ? target : plugin_target);
+  if (file == NULL)
+    {
+      bfd_nonfatal (filename);
+      return FALSE;
+    }

 
 

-             for (j = 0; j < relcount[i]; j++)
-               {
-                 arelent *r;
+  /* If printing line numbers, decompress the debug sections.  */
+  if (line_numbers)
+    file->flags |= BFD_DECOMPRESS;

 
 

-                 r = relocs[i][j];
-                 if (r->sym_ptr_ptr != NULL
-                     && (*r->sym_ptr_ptr)->section == sym->section
-                     && (*r->sym_ptr_ptr)->value == sym->value
-                     && strcmp (symname,
-                                bfd_asymbol_name (*r->sym_ptr_ptr)) == 0
-                     && bfd_find_nearest_line (abfd, secs[i], syms,
-                                               r->address, &filename,
-                                               &functionname, &lineno)
-                     && filename != NULL)
-                   {
-                     /* We only print the first one we find.  */
-                     printf ("\t%s:%u", filename, lineno);
-                     i = seccount;
-                     break;
-                   }
-               }
-           }
-       }
-      else if (bfd_get_section (sym)->owner == abfd)
+  if (bfd_check_format (file, bfd_archive))
+    {
+      display_archive (file);
+    }
+  else if (bfd_check_format_matches (file, bfd_object, &matching))
+    {
+      set_print_width (file);
+      format->print_object_filename (filename);
+      display_rel_file (file, NULL);
+    }
+  else
+    {
+      bfd_nonfatal (filename);
+      if (bfd_get_error () == bfd_error_file_ambiguously_recognized)

        {
        {

-         if (bfd_find_nearest_line (abfd, bfd_get_section (sym), syms,
-                                    sym->value, &filename, &functionname,
-                                    &lineno)
-             && filename != NULL
-             && lineno != 0)
-           {
-             printf ("\t%s:%u", filename, lineno);
-           }
+         list_matching_formats (matching);
+         free (matching);

        }
        }

+      retval = FALSE;

     }
 
     }
 

-  putchar ('\n');
+  if (!bfd_close (file))
+    bfd_fatal (filename);
+
+  lineno_cache_bfd = NULL;
+  lineno_cache_rel_bfd = NULL;
+
+  return retval;

 }
 \f
 /* The following 3 groups of functions are called unconditionally,
 }
 \f
 /* The following 3 groups of functions are called unconditionally,


@@ -1324,22 +1421,20 @@ print_symbol (abfd, sym, ssize, archive_bfd)
 /* Print the name of an object file given on the command line.  */
 
 static void
 /* Print the name of an object file given on the command line.  */
 
 static void

-print_object_filename_bsd (filename)
-     char *filename;
+print_object_filename_bsd (const char *filename)

 {
   if (filename_per_file && !filename_per_symbol)
     printf ("\n%s:\n", filename);
 }
 
 static void
 {
   if (filename_per_file && !filename_per_symbol)
     printf ("\n%s:\n", filename);
 }
 
 static void

-print_object_filename_sysv (filename)
-     char *filename;
+print_object_filename_sysv (const char *filename)

 {
   if (undefined_only)
     printf (_("\n\nUndefined symbols from %s:\n\n"), filename);
   else
     printf (_("\n\nSymbols from %s:\n\n"), filename);
 {
   if (undefined_only)
     printf (_("\n\nUndefined symbols from %s:\n\n"), filename);
   else
     printf (_("\n\nSymbols from %s:\n\n"), filename);

-  if (print_width == 8)
+  if (print_width == 32)

     printf (_("\
 Name                  Value   Class        Type         Size     Line  Section\n\n"));
   else
     printf (_("\
 Name                  Value   Class        Type         Size     Line  Section\n\n"));
   else


@@ -1348,8 +1443,7 @@ Name                  Value           Class        Type         Size
 }
 
 static void
 }
 
 static void

-print_object_filename_posix (filename)
-     char *filename;
+print_object_filename_posix (const char *filename)

 {
   if (filename_per_file && !filename_per_symbol)
     printf ("%s:\n", filename);
 {
   if (filename_per_file && !filename_per_symbol)
     printf ("%s:\n", filename);


@@ -1358,46 +1452,40 @@ print_object_filename_posix (filename)
 /* Print the name of an archive file given on the command line.  */
 
 static void
 /* Print the name of an archive file given on the command line.  */
 
 static void

-print_archive_filename_bsd (filename)
-     char *filename;
+print_archive_filename_bsd (const char *filename)

 {
   if (filename_per_file)
     printf ("\n%s:\n", filename);
 }
 
 static void
 {
   if (filename_per_file)
     printf ("\n%s:\n", filename);
 }
 
 static void

-print_archive_filename_sysv (filename)
-     char *filename ATTRIBUTE_UNUSED;
+print_archive_filename_sysv (const char *filename ATTRIBUTE_UNUSED)

 {
 }
 
 static void
 {
 }
 
 static void

-print_archive_filename_posix (filename)
-     char *filename ATTRIBUTE_UNUSED;
+print_archive_filename_posix (const char *filename ATTRIBUTE_UNUSED)

 {
 }
 \f
 /* Print the name of an archive member file.  */
 
 static void
 {
 }
 \f
 /* Print the name of an archive member file.  */
 
 static void

-print_archive_member_bsd (archive, filename)
-     char *archive ATTRIBUTE_UNUSED;
-     const char *filename;
+print_archive_member_bsd (const char *archive ATTRIBUTE_UNUSED,
+                         const char *filename)

 {
   if (!filename_per_symbol)
     printf ("\n%s:\n", filename);
 }
 
 static void
 {
   if (!filename_per_symbol)
     printf ("\n%s:\n", filename);
 }
 
 static void

-print_archive_member_sysv (archive, filename)
-     char *archive;
-     const char *filename;
+print_archive_member_sysv (const char *archive, const char *filename)

 {
   if (undefined_only)
     printf (_("\n\nUndefined symbols from %s[%s]:\n\n"), archive, filename);
   else
     printf (_("\n\nSymbols from %s[%s]:\n\n"), archive, filename);
 {
   if (undefined_only)
     printf (_("\n\nUndefined symbols from %s[%s]:\n\n"), archive, filename);
   else
     printf (_("\n\nSymbols from %s[%s]:\n\n"), archive, filename);

-  if (print_width == 8)
+  if (print_width == 32)

     printf (_("\
 Name                  Value   Class        Type         Size     Line  Section\n\n"));
   else
     printf (_("\
 Name                  Value   Class        Type         Size     Line  Section\n\n"));
   else


@@ -1406,9 +1494,7 @@ Name                  Value           Class        Type         Size
 }
 
 static void
 }
 
 static void

-print_archive_member_posix (archive, filename)
-     char *archive;
-     const char *filename;
+print_archive_member_posix (const char *archive, const char *filename)

 {
   if (!filename_per_symbol)
     printf ("%s[%s]:\n", archive, filename);
 {
   if (!filename_per_symbol)
     printf ("%s[%s]:\n", archive, filename);


@@ -1418,8 +1504,7 @@ print_archive_member_posix (archive, filename)
    containing a symbol.  */
 
 static void
    containing a symbol.  */
 
 static void

-print_symbol_filename_bsd (archive_bfd, abfd)
-     bfd *archive_bfd, *abfd;
+print_symbol_filename_bsd (bfd *archive_bfd, bfd *abfd)

 {
   if (filename_per_symbol)
     {
 {
   if (filename_per_symbol)
     {


@@ -1430,8 +1515,7 @@ print_symbol_filename_bsd (archive_bfd, abfd)
 }
 
 static void
 }
 
 static void

-print_symbol_filename_sysv (archive_bfd, abfd)
-     bfd *archive_bfd, *abfd;
+print_symbol_filename_sysv (bfd *archive_bfd, bfd *abfd)

 {
   if (filename_per_symbol)
     {
 {
   if (filename_per_symbol)
     {


@@ -1442,8 +1526,7 @@ print_symbol_filename_sysv (archive_bfd, abfd)
 }
 
 static void
 }
 
 static void

-print_symbol_filename_posix (archive_bfd, abfd)
-     bfd *archive_bfd, *abfd;
+print_symbol_filename_posix (bfd *archive_bfd, bfd *abfd)

 {
   if (filename_per_symbol)
     {
 {
   if (filename_per_symbol)
     {


@@ -1458,55 +1541,70 @@ print_symbol_filename_posix (archive_bfd, abfd)
 /* Print a symbol value.  */
 
 static void
 /* Print a symbol value.  */
 
 static void

-print_value (abfd, val)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_vma val;
+print_value (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma val)

 {
 {

-#if ! defined (BFD64) || BFD_HOST_64BIT_LONG
-  printf (value_format, val);
-#else
-  /* We have a 64 bit value to print, but the host is only 32 bit.  */
-  if (print_radix == 16)
-    bfd_fprintf_vma (abfd, stdout, val);
-  else
+  switch (print_width)

     {
     {

-      char buf[30];
-      char *s;
+    case 32:
+      printf (print_format_string, (unsigned long) val);
+      break;

 
 

-      s = buf + sizeof buf;
-      *--s = '\0';
-      while (val > 0)
+    case 64:
+#if BFD_HOST_64BIT_LONG || BFD_HOST_64BIT_LONG_LONG
+      printf (print_format_string, val);
+#else
+      /* We have a 64 bit value to print, but the host is only 32 bit.  */
+      if (print_radix == 16)
+       bfd_fprintf_vma (abfd, stdout, val);
+      else

        {
        {

-         *--s = (val % print_radix) + '0';
-         val /= print_radix;
+         char buf[30];
+         char *s;
+
+         s = buf + sizeof buf;
+         *--s = '\0';
+         while (val > 0)
+           {
+             *--s = (val % print_radix) + '0';
+             val /= print_radix;
+           }
+         while ((buf + sizeof buf - 1) - s < 16)
+           *--s = '0';
+         printf ("%s", s);

        }
        }

-      while ((buf + sizeof buf - 1) - s < 16)
-       *--s = '0';
-      printf ("%s", s);
-    }

 #endif
 #endif

+      break;
+
+    default:
+      fatal (_("Print width has not been initialized (%d)"), print_width);
+      break;
+    }

 }
 
 /* Print a line of information about a symbol.  */
 
 static void
 }
 
 /* Print a line of information about a symbol.  */
 
 static void

-print_symbol_info_bsd (info, abfd)
-     struct extended_symbol_info *info;
-     bfd *abfd;
+print_symbol_info_bsd (struct extended_symbol_info *info, bfd *abfd)

 {
   if (bfd_is_undefined_symclass (SYM_TYPE (info)))
     {
 {
   if (bfd_is_undefined_symclass (SYM_TYPE (info)))
     {

-      if (print_width == 16)
+      if (print_width == 64)

        printf ("        ");
       printf ("        ");
     }
   else
     {
        printf ("        ");
       printf ("        ");
     }
   else
     {

-      print_value (abfd, SYM_VALUE (info));
-
+      /* Normally we print the value of the symbol.  If we are printing the
+        size or sorting by size then we print its size, except for the
+        (weird) special case where both flags are defined, in which case we
+        print both values.  This conforms to documented behaviour.  */
+      if (sort_by_size && !print_size)
+       print_value (abfd, SYM_SIZE (info));
+      else
+       print_value (abfd, SYM_VALUE (info));

       if (print_size && SYM_SIZE (info))
        {
       if (print_size && SYM_SIZE (info))
        {

-         printf(" ");
+         printf (" ");

          print_value (abfd, SYM_SIZE (info));
        }
     }
          print_value (abfd, SYM_SIZE (info));
        }
     }


@@ -1522,19 +1620,17 @@ print_symbol_info_bsd (info, abfd)
       printf (desc_format, SYM_STAB_DESC (info));
       printf (" %5s", SYM_STAB_NAME (info));
     }
       printf (desc_format, SYM_STAB_DESC (info));
       printf (" %5s", SYM_STAB_NAME (info));
     }

-  print_symname (" %s", SYM_NAME (info), abfd);
+  print_symname (" %s", info, NULL, abfd);

 }
 
 static void
 }
 
 static void

-print_symbol_info_sysv (info, abfd)
-     struct extended_symbol_info *info;
-     bfd *abfd;
+print_symbol_info_sysv (struct extended_symbol_info *info, bfd *abfd)

 {
 {

-  print_symname ("%-20s|", SYM_NAME (info), abfd);
+  print_symname ("%-20s|", info, NULL, abfd);

 
   if (bfd_is_undefined_symclass (SYM_TYPE (info)))
     {
 
   if (bfd_is_undefined_symclass (SYM_TYPE (info)))
     {

-      if (print_width == 8)
+      if (print_width == 32)

        printf ("        ");
       else
        printf ("                ");
        printf ("        ");
       else
        printf ("                ");


@@ -1547,16 +1643,19 @@ print_symbol_info_sysv (info, abfd)
   if (SYM_TYPE (info) == '-')
     {
       /* A stab.  */
   if (SYM_TYPE (info) == '-')
     {
       /* A stab.  */

-      printf ("%18s|  ", SYM_STAB_NAME (info));                /* (C) Type */
-      printf (desc_format, SYM_STAB_DESC (info));      /* Size */
-      printf ("|     |");                              /* Line, Section */
+      printf ("%18s|  ", SYM_STAB_NAME (info));                /* (C) Type.  */
+      printf (desc_format, SYM_STAB_DESC (info));      /* Size.  */
+      printf ("|     |");                              /* Line, Section.  */

     }
   else
     {
       /* Type, Size, Line, Section */
       if (info->elfinfo)
        printf ("%18s|",
     }
   else
     {
       /* Type, Size, Line, Section */
       if (info->elfinfo)
        printf ("%18s|",

-               get_symbol_type (ELF_ST_TYPE (info->elfinfo->internal_elf_sym.st_info)));
+               get_elf_symbol_type (ELF_ST_TYPE (info->elfinfo->internal_elf_sym.st_info)));
+      else if (info->coffinfo)
+       printf ("%18s|",
+               get_coff_symbol_type (&info->coffinfo->native->u.syment));

       else
        printf ("                  |");
 
       else
        printf ("                  |");
 


@@ -1564,7 +1663,7 @@ print_symbol_info_sysv (info, abfd)
        print_value (abfd, SYM_SIZE (info));
       else
        {
        print_value (abfd, SYM_SIZE (info));
       else
        {

-         if (print_width == 8)
+         if (print_width == 32)

            printf ("        ");
          else
            printf ("                ");
            printf ("        ");
          else
            printf ("                ");


@@ -1572,17 +1671,17 @@ print_symbol_info_sysv (info, abfd)
 
       if (info->elfinfo)
        printf("|     |%s", info->elfinfo->symbol.section->name);
 
       if (info->elfinfo)
        printf("|     |%s", info->elfinfo->symbol.section->name);

+      else if (info->coffinfo)
+       printf("|     |%s", info->coffinfo->symbol.section->name);

       else
        printf("|     |");
     }
 }
 
 static void
       else
        printf("|     |");
     }
 }
 
 static void

-print_symbol_info_posix (info, abfd)
-     struct extended_symbol_info *info;
-     bfd *abfd;
+print_symbol_info_posix (struct extended_symbol_info *info, bfd *abfd)

 {
 {

-  print_symname ("%s ", SYM_NAME (info), abfd);
+  print_symname ("%s ", info, NULL, abfd);

   printf ("%c ", SYM_TYPE (info));
 
   if (bfd_is_undefined_symclass (SYM_TYPE (info)))
   printf ("%c ", SYM_TYPE (info));
 
   if (bfd_is_undefined_symclass (SYM_TYPE (info)))


@@ -1596,69 +1695,188 @@ print_symbol_info_posix (info, abfd)
     }
 }
 \f
     }
 }
 \f

-static void
-print_symdef_entry (abfd)
-     bfd *abfd;
+int
+main (int argc, char **argv)

 {
 {

-  symindex idx = BFD_NO_MORE_SYMBOLS;
-  carsym *thesym;
-  boolean everprinted = false;
+  int c;
+  int retval;

 
 

-  for (idx = bfd_get_next_mapent (abfd, idx, &thesym);
-       idx != BFD_NO_MORE_SYMBOLS;
-       idx = bfd_get_next_mapent (abfd, idx, &thesym))
+#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES)
+  setlocale (LC_MESSAGES, "");
+#endif
+#if defined (HAVE_SETLOCALE)
+  setlocale (LC_CTYPE, "");
+  setlocale (LC_COLLATE, "");
+#endif
+  bindtextdomain (PACKAGE, LOCALEDIR);
+  textdomain (PACKAGE);
+
+  program_name = *argv;
+  xmalloc_set_program_name (program_name);
+  bfd_set_error_program_name (program_name);
+#if BFD_SUPPORTS_PLUGINS
+  bfd_plugin_set_program_name (program_name);
+#endif
+
+  START_PROGRESS (program_name, 0);
+
+  expandargv (&argc, &argv);
+
+  if (bfd_init () != BFD_INIT_MAGIC)
+    fatal (_("fatal error: libbfd ABI mismatch"));
+  set_default_bfd_target ();
+
+  while ((c = getopt_long (argc, argv, "aABCDef:gHhlnopPrSst:uvVvX:",
+                          long_options, (int *) 0)) != EOF)

     {
     {

-      bfd *elt;
-      if (!everprinted)
-       {
-         printf (_("\nArchive index:\n"));
-         everprinted = true;
-       }
-      elt = bfd_get_elt_at_index (abfd, idx);
-      if (elt == NULL)
-       bfd_fatal ("bfd_get_elt_at_index");
-      if (thesym->name != (char *) NULL)
+      switch (c)

        {
        {

-         print_symname ("%s", thesym->name, abfd);
-         printf (" in %s\n", bfd_get_filename (elt));
+       case 'a':
+         print_debug_syms = 1;
+         break;
+       case 'A':
+       case 'o':
+         filename_per_symbol = 1;
+         break;
+       case 'B':               /* For MIPS compatibility.  */
+         set_output_format ("bsd");
+         break;
+       case 'C':
+         do_demangle = 1;
+         if (optarg != NULL)
+           {
+             enum demangling_styles style;
+
+             style = cplus_demangle_name_to_style (optarg);
+             if (style == unknown_demangling)
+               fatal (_("unknown demangling style `%s'"),
+                      optarg);
+
+             cplus_demangle_set_style (style);
+           }
+         break;
+       case OPTION_RECURSE_LIMIT:
+         demangle_flags &= ~ DMGL_NO_RECURSE_LIMIT;
+         break;
+       case OPTION_NO_RECURSE_LIMIT:
+         demangle_flags |= DMGL_NO_RECURSE_LIMIT;
+         break;
+       case 'D':
+         dynamic = 1;
+         break;
+       case 'e':
+         /* Ignored for HP/UX compatibility.  */
+         break;
+       case 'f':
+         set_output_format (optarg);
+         break;
+       case 'g':
+         external_only = 1;
+         break;
+       case 'H':
+       case 'h':
+         usage (stdout, 0);
+       case 'l':
+         line_numbers = 1;
+         break;
+       case 'n':
+       case 'v':
+         no_sort = 0;
+         sort_numerically = 1;
+         sort_by_size = 0;
+         break;
+       case 'p':
+         no_sort = 1;
+         sort_numerically = 0;
+         sort_by_size = 0;
+         break;
+       case OPTION_SIZE_SORT:
+         no_sort = 0;
+         sort_numerically = 0;
+         sort_by_size = 1;
+         break;
+       case 'P':
+         set_output_format ("posix");
+         break;
+       case 'r':
+         reverse_sort = 1;
+         break;
+       case 's':
+         print_armap = 1;
+         break;
+       case 'S':
+         print_size = 1;
+         break;
+       case 't':
+         set_print_radix (optarg);
+         break;
+       case 'u':
+         undefined_only = 1;
+         break;
+       case 'V':
+         show_version = 1;
+         break;
+       case 'X':
+         /* Ignored for (partial) AIX compatibility.  On AIX, the
+            argument has values 32, 64, or 32_64, and specifies that
+            only 32-bit, only 64-bit, or both kinds of objects should
+            be examined.  The default is 32.  So plain AIX nm on a
+            library archive with both kinds of objects will ignore
+            the 64-bit ones.  For GNU nm, the default is and always
+            has been -X 32_64, and other options are not supported.  */
+         if (strcmp (optarg, "32_64") != 0)
+           fatal (_("Only -X 32_64 is supported"));
+         break;
+
+       case OPTION_TARGET:     /* --target */
+         target = optarg;
+         break;
+
+       case OPTION_PLUGIN:     /* --plugin */
+#if BFD_SUPPORTS_PLUGINS
+         bfd_plugin_set_plugin (optarg);
+#else
+         fatal (_("sorry - this program has been built without plugin support\n"));
+#endif
+         break;
+
+       case 0:         /* A long option that just sets a flag.  */
+         break;
+
+       default:
+         usage (stderr, 1);

        }
     }
        }
     }

-}
-\f
-/* This function is used to get the relocs for a particular section.
-   It is called via bfd_map_over_sections.  */
-
-static void
-get_relocs (abfd, sec, dataarg)
-     bfd *abfd;
-     asection *sec;
-     PTR dataarg;
-{
-  struct get_relocs_info *data = (struct get_relocs_info *) dataarg;

 
 

-  *data->secs = sec;
+  if (show_version)
+    print_version ("nm");

 
 

-  if ((sec->flags & SEC_RELOC) == 0)
+  if (sort_by_size && undefined_only)

     {
     {

-      *data->relocs = NULL;
-      *data->relcount = 0;
+      non_fatal (_("Using the --size-sort and --undefined-only options together"));
+      non_fatal (_("will produce no output, since undefined symbols have no size."));
+      return 0;

     }
     }

-  else
-    {
-      long relsize;

 
 

-      relsize = bfd_get_reloc_upper_bound (abfd, sec);
-      if (relsize < 0)
-       bfd_fatal (bfd_get_filename (abfd));
+  /* OK, all options now parsed.  If no filename specified, do a.out.  */
+  if (optind == argc)
+    return !display_file ("a.out");

 
 

-      *data->relocs = (arelent **) xmalloc (relsize);
-      *data->relcount = bfd_canonicalize_reloc (abfd, sec, *data->relocs,
-                                               data->syms);
-      if (*data->relcount < 0)
-       bfd_fatal (bfd_get_filename (abfd));
+  retval = 0;
+
+  if (argc - optind > 1)
+    filename_per_file = 1;
+
+  /* We were given several filenames to do.  */
+  while (optind < argc)
+    {
+      PROGRESS (1);
+      if (!display_file (argv[optind++]))
+       retval++;

     }
 
     }
 

-  ++data->secs;
-  ++data->relocs;
-  ++data->relcount;
+  END_PROGRESS (program_name);
+
+  exit (retval);
+  return retval;

 }
 }