projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add vmfunc
[deliverable/binutils-gdb.git]
/
binutils
/
nm.c
diff --git
a/binutils/nm.c
b/binutils/nm.c
index 5ad9c2060e5553fe9ad4b120b15f05f993d23c81..04067b158130b7cb2caa716e678acd4b6b9c156f 100644
(file)
--- a/
binutils/nm.c
+++ b/
binutils/nm.c
@@
-1,6
+1,6
@@
/* nm.c -- Describe symbol table of a rel file.
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
/* 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, 2008, 2009
+ 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009
, 2010
Free Software Foundation, Inc.
This file is part of GNU Binutils.
Free Software Foundation, Inc.
This file is part of GNU Binutils.
@@
-164,7
+164,11
@@
static char value_format_32bit[] = "%08lx";
#if BFD_HOST_64BIT_LONG
static char value_format_64bit[] = "%016lx";
#elif BFD_HOST_64BIT_LONG_LONG
#if BFD_HOST_64BIT_LONG
static char value_format_64bit[] = "%016lx";
#elif BFD_HOST_64BIT_LONG_LONG
+#ifndef __MSVCRT__
static char value_format_64bit[] = "%016llx";
static char value_format_64bit[] = "%016llx";
+#else
+static char value_format_64bit[] = "%016I64x";
+#endif
#endif
static int print_width = 0;
static int print_radix = 16;
#endif
static int print_width = 0;
static int print_radix = 16;
@@
-173,6
+177,7
@@
static char other_format[] = "%02x";
static char desc_format[] = "%04x";
static char *target = NULL;
static char desc_format[] = "%04x";
static char *target = NULL;
+static char *plugin_target = NULL;
/* Used to cache the line numbers for a BFD. */
static bfd *lineno_cache_bfd;
/* Used to cache the line numbers for a BFD. */
static bfd *lineno_cache_bfd;
@@
-246,7
+251,7
@@
usage (FILE *stream, int status)
--plugin NAME Load the specified plugin\n"));
#endif
fprintf (stream, _("\
--plugin NAME Load the specified plugin\n"));
#endif
fprintf (stream, _("\
- -S, --print-size Print size of defined symbols\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\
-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\
@@
-284,7
+289,11
@@
set_print_radix (char *radix)
#if BFD_HOST_64BIT_LONG
value_format_64bit[5] = *radix;
#elif BFD_HOST_64BIT_LONG_LONG
#if BFD_HOST_64BIT_LONG
value_format_64bit[5] = *radix;
#elif BFD_HOST_64BIT_LONG_LONG
+#ifndef __MSVCRT__
value_format_64bit[6] = *radix;
value_format_64bit[6] = *radix;
+#else
+ value_format_64bit[7] = *radix;
+#endif
#endif
other_format[3] = desc_format[3] = *radix;
break;
#endif
other_format[3] = desc_format[3] = *radix;
break;
@@
-427,6
+436,8
@@
filter_symbols (bfd *abfd, bfd_boolean is_dynamic, void *minisyms,
else if (external_only)
keep = ((sym->flags & BSF_GLOBAL) != 0
|| (sym->flags & BSF_WEAK) != 0
else if (external_only)
keep = ((sym->flags & BSF_GLOBAL) != 0
|| (sym->flags & BSF_WEAK) != 0
+ /* PR binutls/12753: Unique symbols are global too. */
+ || (sym->flags & BSF_GNU_UNIQUE) != 0
|| bfd_is_und_section (sym->section)
|| bfd_is_com_section (sym->section));
else
|| bfd_is_und_section (sym->section)
|| bfd_is_com_section (sym->section));
else
@@
-1092,6
+1103,7
@@
display_rel_file (bfd *abfd, bfd *archive_bfd)
print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd);
free (minisyms);
print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd);
free (minisyms);
+ free (symsizes);
}
static void
}
static void
@@
-1183,13
+1195,17
@@
display_file (char *filename)
if (get_file_size (filename) < 1)
return FALSE;
if (get_file_size (filename) < 1)
return FALSE;
- file = bfd_openr (filename, target);
+ file = bfd_openr (filename, target
? target : plugin_target
);
if (file == NULL)
{
bfd_nonfatal (filename);
return FALSE;
}
if (file == NULL)
{
bfd_nonfatal (filename);
return FALSE;
}
+ /* If printing line numbers, decompress the debug sections. */
+ if (line_numbers)
+ file->flags |= BFD_DECOMPRESS;
+
if (bfd_check_format (file, bfd_archive))
{
display_archive (file);
if (bfd_check_format (file, bfd_archive))
{
display_archive (file);
@@
-1621,6
+1637,7
@@
main (int argc, char **argv)
case OPTION_PLUGIN: /* --plugin */
#if BFD_SUPPORTS_PLUGINS
case OPTION_PLUGIN: /* --plugin */
#if BFD_SUPPORTS_PLUGINS
+ plugin_target = "plugin";
bfd_plugin_set_plugin (optarg);
#else
fatal (_("sorry - this program has been built without plugin support\n"));
bfd_plugin_set_plugin (optarg);
#else
fatal (_("sorry - this program has been built without plugin support\n"));
This page took
0.023965 seconds
and
4
git commands to generate.