* corefile.c (num_of_syms_in): New function - computes the number

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

diff --git a/binutils/nm.c b/binutils/nm.c
index 5d4300549691eab4980be9f351e0eab98824d77c..51f67d143130a9c3003de7d9f30bb1df4d29ca72 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -1,13 +1,13 @@
 /* nm.c -- Describe symbol table of a rel file.
    Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2004, 2005, 2007
+   2001, 2002, 2003, 2004, 2005, 2007, 2009
    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
-   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,
@@ -20,10 +20,9 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
+#include "sysdep.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"
@@ -31,6 +30,8 @@
 #include "libiberty.h"
 #include "elf-bfd.h"
 #include "elf/common.h"
+#include "bucomm.h"
+#include "plugin.h"
 
 /* When sorting by size, we use this structure to hold the size and a
    pointer to the minisymbol.  */
@@ -160,7 +161,11 @@ static int filename_per_symbol = 0;        /* Once per symbol, at start of line.  */
 
 /* Print formats for printing a symbol value.  */
 static char value_format_32bit[] = "%08lx";
+#if BFD_HOST_64BIT_LONG
 static char value_format_64bit[] = "%016lx";
+#elif BFD_HOST_64BIT_LONG_LONG
+static char value_format_64bit[] = "%016llx";
+#endif
 static int print_width = 0;
 static int print_radix = 16;
 /* Print formats for printing stab info.  */
@@ -174,6 +179,7 @@ static bfd *lineno_cache_bfd;
 static bfd *lineno_cache_rel_bfd;
 
 #define OPTION_TARGET 200
+#define OPTION_PLUGIN 201
 
 static struct option long_options[] =
 {
@@ -188,6 +194,7 @@ static struct option long_options[] =
   {"no-demangle", no_argument, &do_demangle, 0},
   {"no-sort", no_argument, &no_sort, 1},
   {"numeric-sort", no_argument, &sort_numerically, 1},
+  {"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'},
@@ -233,8 +240,11 @@ usage (FILE *stream, int status)
   -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\
-  -S, --print-size       Print size of defined symbols\n\
+  -r, --reverse-sort     Reverse the sense of the sort\n"
+#if BFD_SUPPORTS_PLUGINS
+"      --plugin NAME      Load the specified plugin\n"
+#endif
+"  -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\
@@ -269,7 +279,11 @@ set_print_radix (char *radix)
       else
        print_radix = 8;
       value_format_32bit[4] = *radix;
+#if BFD_HOST_64BIT_LONG
       value_format_64bit[5] = *radix;
+#elif BFD_HOST_64BIT_LONG_LONG
+      value_format_64bit[6] = *radix;
+#endif
       other_format[3] = desc_format[3] = *radix;
       break;
     default:
@@ -335,11 +349,14 @@ print_symname (const char *format, const char *name, bfd *abfd)
 {
   if (do_demangle && *name)
     {
-      char *res = demangle (abfd, name);
+      char *res = bfd_demangle (abfd, name, DMGL_ANSI | DMGL_PARAMS);
 
-      printf (format, res);
-      free (res);
-      return;
+      if (res != NULL)
+       {
+         printf (format, res);
+         free (res);
+         return;
+       }
     }
 
   printf (format, name);
@@ -438,7 +455,8 @@ filter_symbols (bfd *abfd, bfd_boolean dynamic, void *minisyms,
 
       if (keep)
        {
-         memcpy (to, from, size);
+         if (to != from)
+           memcpy (to, from, size);
          to += size;
        }
     }
@@ -1338,7 +1356,7 @@ print_value (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma val)
       break;
 
     case 64:
-#if BFD_HOST_64BIT_LONG
+#if BFD_HOST_64BIT_LONG || BFD_HOST_64BIT_LONG_LONG
       printf (value_format_64bit, val);
 #else
       /* We have a 64 bit value to print, but the host is only 32 bit.  */
@@ -1497,6 +1515,9 @@ main (int argc, char **argv)
 
   program_name = *argv;
   xmalloc_set_program_name (program_name);
+#if BFD_SUPPORTS_PLUGINS
+  bfd_plugin_set_program_name (program_name);
+#endif
 
   START_PROGRESS (program_name, 0);
 
@@ -1596,6 +1617,14 @@ main (int argc, char **argv)
          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;