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 b03d1b6aad4132afb6e94260b59329c32a69696c..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, 200
9
+ 2001, 2002, 2003, 2004, 2005, 2007, 200
8, 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;
@@
-240,11
+245,13
@@
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\
-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
#if BFD_SUPPORTS_PLUGINS
-" --plugin NAME Load the specified plugin\n"
+ fprintf (stream, _("\
+ --plugin NAME Load the specified plugin\n"));
#endif
#endif
-" -S, --print-size Print size of defined symbols\n\
+ 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\
--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\
@@
-282,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;
@@
-341,11
+352,11
@@
get_symbol_type (unsigned int type)
}
}
\f
}
}
\f
-/* Print symbol name NAME, read from ABFD, with printf format FORM
AT
,
+/* Print symbol name NAME, read from ABFD, with printf format FORM,
demangling it if requested. */
static void
demangling it if requested. */
static void
-print_symname (const char *form
at
, const char *name, bfd *abfd)
+print_symname (const char *form, const char *name, bfd *abfd)
{
if (do_demangle && *name)
{
{
if (do_demangle && *name)
{
@@
-353,13
+364,13
@@
print_symname (const char *format, const char *name, bfd *abfd)
if (res != NULL)
{
if (res != NULL)
{
- printf (form
at
, res);
+ printf (form, res);
free (res);
return;
}
}
free (res);
return;
}
}
- printf (form
at
, name);
+ printf (form, name);
}
static void
}
static void
@@
-395,7
+406,7
@@
print_symdef_entry (bfd *abfd)
Return the number of symbols to be printed. */
static long
Return the number of symbols to be printed. */
static long
-filter_symbols (bfd *abfd, bfd_boolean dynamic, void *minisyms,
+filter_symbols (bfd *abfd, bfd_boolean
is_
dynamic, void *minisyms,
long symcount, unsigned int size)
{
bfd_byte *from, *fromend, *to;
long symcount, unsigned int size)
{
bfd_byte *from, *fromend, *to;
@@
-416,7
+427,7
@@
filter_symbols (bfd *abfd, bfd_boolean dynamic, void *minisyms,
PROGRESS (1);
PROGRESS (1);
- sym = bfd_minisymbol_to_symbol (abfd, dynamic, (const void *) from, store);
+ sym = bfd_minisymbol_to_symbol (abfd,
is_
dynamic, (const void *) from, store);
if (sym == NULL)
bfd_fatal (bfd_get_filename (abfd));
if (sym == NULL)
bfd_fatal (bfd_get_filename (abfd));
@@
-425,6
+436,8
@@
filter_symbols (bfd *abfd, bfd_boolean 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
@@
-657,7
+670,7
@@
size_forward2 (const void *P_x, const void *P_y)
size. */
static long
size. */
static long
-sort_symbols_by_size (bfd *abfd, bfd_boolean dynamic, void *minisyms,
+sort_symbols_by_size (bfd *abfd, bfd_boolean
is_
dynamic, void *minisyms,
long symcount, unsigned int size,
struct size_sym **symsizesp)
{
long symcount, unsigned int size,
struct size_sym **symsizesp)
{
@@
-670,7
+683,7
@@
sort_symbols_by_size (bfd *abfd, bfd_boolean dynamic, void *minisyms,
/* We are going to return a special set of symbols and sizes to
print. */
/* We are going to return a special set of symbols and sizes to
print. */
- symsizes = xmalloc (symcount * sizeof (struct size_sym));
+ symsizes =
(struct size_sym *)
xmalloc (symcount * sizeof (struct size_sym));
*symsizesp = symsizes;
/* Note that filter_symbols has already removed all absolute and
*symsizesp = symsizes;
/* Note that filter_symbols has already removed all absolute and
@@
-684,7
+697,7
@@
sort_symbols_by_size (bfd *abfd, bfd_boolean dynamic, void *minisyms,
if (from < fromend)
{
if (from < fromend)
{
- sym = bfd_minisymbol_to_symbol (abfd, dynamic, (const void *) 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));
@@
-700,7
+713,7
@@
sort_symbols_by_size (bfd *abfd, bfd_boolean dynamic, void *minisyms,
if (from + size < fromend)
{
next = bfd_minisymbol_to_symbol (abfd,
if (from + size < fromend)
{
next = bfd_minisymbol_to_symbol (abfd,
- dynamic,
+
is_
dynamic,
(const void *) (from + size),
store_next);
if (next == NULL)
(const void *) (from + size),
store_next);
if (next == NULL)
@@
-771,7
+784,7
@@
get_relocs (bfd *abfd, asection *sec, void *dataarg)
if (relsize < 0)
bfd_fatal (bfd_get_filename (abfd));
if (relsize < 0)
bfd_fatal (bfd_get_filename (abfd));
- *data->relocs = xmalloc (relsize);
+ *data->relocs =
(arelent **)
xmalloc (relsize);
*data->relcount = bfd_canonicalize_reloc (abfd, sec, *data->relocs,
data->syms);
if (*data->relcount < 0)
*data->relcount = bfd_canonicalize_reloc (abfd, sec, *data->relocs,
data->syms);
if (*data->relcount < 0)
@@
-826,7
+839,7
@@
print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd)
symsize = bfd_get_symtab_upper_bound (abfd);
if (symsize < 0)
bfd_fatal (bfd_get_filename (abfd));
symsize = bfd_get_symtab_upper_bound (abfd);
if (symsize < 0)
bfd_fatal (bfd_get_filename (abfd));
- syms = xmalloc (symsize);
+ syms =
(asymbol **)
xmalloc (symsize);
symcount = bfd_canonicalize_symtab (abfd, syms);
if (symcount < 0)
bfd_fatal (bfd_get_filename (abfd));
symcount = bfd_canonicalize_symtab (abfd, syms);
if (symcount < 0)
bfd_fatal (bfd_get_filename (abfd));
@@
-859,19
+872,19
@@
print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd)
if (relocs == NULL)
{
if (relocs == NULL)
{
- struct get_relocs_info info;
+ struct get_relocs_info
r
info;
seccount = bfd_count_sections (abfd);
seccount = bfd_count_sections (abfd);
- secs = xmalloc (seccount * sizeof *secs);
- relocs = xmalloc (seccount * sizeof *relocs);
- relcount = xmalloc (seccount * sizeof *relcount);
+ secs =
(asection **)
xmalloc (seccount * sizeof *secs);
+ relocs =
(arelent ***)
xmalloc (seccount * sizeof *relocs);
+ relcount =
(long *)
xmalloc (seccount * sizeof *relcount);
- info.secs = secs;
- info.relocs = relocs;
- info.relcount = relcount;
- info.syms = syms;
- bfd_map_over_sections (abfd, get_relocs, (void *) &info);
+
r
info.secs = secs;
+
r
info.relocs = relocs;
+
r
info.relcount = relcount;
+
r
info.syms = syms;
+ bfd_map_over_sections (abfd, get_relocs, (void *) &
r
info);
lineno_cache_rel_bfd = abfd;
}
lineno_cache_rel_bfd = abfd;
}
@@
-921,7
+934,7
@@
print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd)
/* Print the symbols when sorting by size. */
static void
/* Print the symbols when sorting by size. */
static void
-print_size_symbols (bfd *abfd, bfd_boolean dynamic,
+print_size_symbols (bfd *abfd, bfd_boolean
is_
dynamic,
struct size_sym *symsizes, long symcount,
bfd *archive_bfd)
{
struct size_sym *symsizes, long symcount,
bfd *archive_bfd)
{
@@
-939,7
+952,7
@@
print_size_symbols (bfd *abfd, bfd_boolean dynamic,
asymbol *sym;
bfd_vma ssize;
asymbol *sym;
bfd_vma ssize;
- sym = bfd_minisymbol_to_symbol (abfd, dynamic, from->minisym, store);
+ sym = bfd_minisymbol_to_symbol (abfd,
is_
dynamic, from->minisym, store);
if (sym == NULL)
bfd_fatal (bfd_get_filename (abfd));
if (sym == NULL)
bfd_fatal (bfd_get_filename (abfd));
@@
-958,7
+971,7
@@
print_size_symbols (bfd *abfd, bfd_boolean dynamic,
containing ABFD. */
static void
containing ABFD. */
static void
-print_symbols (bfd *abfd, bfd_boolean dynamic, void *minisyms, long symcount,
+print_symbols (bfd *abfd, bfd_boolean
is_
dynamic, void *minisyms, long symcount,
unsigned int size, bfd *archive_bfd)
{
asymbol *store;
unsigned int size, bfd *archive_bfd)
{
asymbol *store;
@@
-974,7
+987,7
@@
print_symbols (bfd *abfd, bfd_boolean dynamic, void *minisyms, long symcount,
{
asymbol *sym;
{
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));
@@
-1023,18
+1036,18
@@
display_rel_file (bfd *abfd, bfd *archive_bfd)
if (dynamic)
{
dyn_count = symcount;
if (dynamic)
{
dyn_count = symcount;
- dyn_syms = minisyms;
+ dyn_syms =
(asymbol **)
minisyms;
}
else
{
long storage = bfd_get_dynamic_symtab_upper_bound (abfd);
static_count = symcount;
}
else
{
long storage = bfd_get_dynamic_symtab_upper_bound (abfd);
static_count = symcount;
- static_syms = minisyms;
+ static_syms =
(asymbol **)
minisyms;
if (storage > 0)
{
if (storage > 0)
{
- dyn_syms = xmalloc (storage);
+ dyn_syms =
(asymbol **)
xmalloc (storage);
dyn_count = bfd_canonicalize_dynamic_symtab (abfd, dyn_syms);
if (dyn_count < 0)
bfd_fatal (bfd_get_filename (abfd));
dyn_count = bfd_canonicalize_dynamic_symtab (abfd, dyn_syms);
if (dyn_count < 0)
bfd_fatal (bfd_get_filename (abfd));
@@
-1049,7
+1062,7
@@
display_rel_file (bfd *abfd, bfd *archive_bfd)
long i;
new_mini = xmalloc ((symcount + synth_count + 1) * sizeof (*symp));
long i;
new_mini = xmalloc ((symcount + synth_count + 1) * sizeof (*symp));
- symp = new_mini;
+ symp =
(asymbol **)
new_mini;
memcpy (symp, minisyms, symcount * sizeof (*symp));
symp += symcount;
for (i = 0; i < synth_count; i++)
memcpy (symp, minisyms, symcount * sizeof (*symp));
symp += symcount;
for (i = 0; i < synth_count; i++)
@@
-1090,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
@@
-1181,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);
@@
-1515,6
+1533,9
@@
main (int argc, char **argv)
program_name = *argv;
xmalloc_set_program_name (program_name);
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);
START_PROGRESS (program_name, 0);
@@
-1616,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.028115 seconds
and
4
git commands to generate.