X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Fnm.c;h=fd3f73167e085defd041c04e1a3f487ed93c57f0;hb=f7e13587eaf1e2d433e21ac0a9e413a98e53652d;hp=766564dc847c9381b7eb6ba191fcc0eb595fb145;hpb=7d0b9ebc1e0079271a7c7737b53bc026525eab64;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/nm.c b/binutils/nm.c index 766564dc84..fd3f73167e 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -1,5 +1,5 @@ /* nm.c -- Describe symbol table of a rel file. - Copyright (C) 1991-2016 Free Software Foundation, Inc. + Copyright (C) 1991-2019 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -141,6 +141,7 @@ static struct output_fns formats[] = /* The output format to use. */ static struct output_fns *format = &formats[FORMAT_DEFAULT]; +static unsigned int print_format = FORMAT_DEFAULT; /* Command options. */ @@ -157,26 +158,17 @@ 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 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 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. */ -/* 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 -#ifndef __MSVCRT__ -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; /* Print formats for printing stab info. */ @@ -194,9 +186,14 @@ static const char *plugin_target = NULL; static bfd *lineno_cache_bfd; static bfd *lineno_cache_rel_bfd; -#define OPTION_TARGET 200 -#define OPTION_PLUGIN (OPTION_TARGET + 1) -#define OPTION_SIZE_SORT (OPTION_PLUGIN + 1) +enum long_option_values +{ + OPTION_TARGET = 200, + OPTION_PLUGIN, + OPTION_SIZE_SORT, + OPTION_RECURSE_LIMIT, + OPTION_NO_RECURSE_LIMIT +}; static struct option long_options[] = { @@ -209,6 +206,8 @@ 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}, + {"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}, @@ -217,21 +216,23 @@ static struct option long_options[] = {"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}, {"size-sort", no_argument, 0, OPTION_SIZE_SORT}, {"special-syms", no_argument, &allow_special_symbols, 1}, - {"stats", no_argument, &show_stats, 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}, + {"with-symbol-versions", no_argument, &with_symbol_versions, 1}, {0, no_argument, 0, 0} }; /* Some error-reporting functions. */ -static void +ATTRIBUTE_NORETURN static void usage (FILE *stream, int status) { fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name); @@ -245,6 +246,8 @@ usage (FILE *stream, int status) `gnu', `lucid', `arm', `hp', `edg', `gnu-v3', `java'\n\ or `gnat'\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\ @@ -271,6 +274,7 @@ usage (FILE *stream, int status) -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\ @FILE Read options from FILE\n\ -h, --help Display this information\n\ @@ -289,29 +293,15 @@ set_print_radix (char *radix) { switch (*radix) { - case 'x': - break; - case 'd': - case 'o': - if (*radix == 'd') - print_radix = 10; - 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 -#ifndef __MSVCRT__ - value_format_64bit[6] = *radix; -#else - value_format_64bit[7] = *radix; -#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); } + + other_format[3] = desc_format[3] = *radix; } static void @@ -337,12 +327,14 @@ set_output_format (char *f) fatal (_("%s: invalid output format"), f); } format = &formats[i]; + print_format = i; } static const char * get_elf_symbol_type (unsigned int type) { - static char buff [32]; + static char *bufp; + int n; switch (type) { @@ -353,21 +345,25 @@ get_elf_symbol_type (unsigned int type) 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, _(": %d"), type); - else if (type >= STT_LOOS && type <= STT_HIOS) - sprintf (buff, _(": %d"), type); - else - sprintf (buff, _(": %d"), type); - return buff; } + + free (bufp); + if (type >= STT_LOPROC && type <= STT_HIPROC) + n = asprintf (&bufp, _(": %d"), type); + else if (type >= STT_LOOS && type <= STT_HIOS) + n = asprintf (&bufp, _(": %d"), type); + else + n = asprintf (&bufp, _(": %d"), type); + if (n < 0) + fatal ("%s", xstrerror (errno)); + return bufp; } static const char * get_coff_symbol_type (const struct internal_syment *sym) { - static char buff [32]; + static char *bufp; + int n; switch (sym->n_sclass) { @@ -378,16 +374,19 @@ get_coff_symbol_type (const struct internal_syment *sym) if (!sym->n_type) return "None"; - + switch (DTYPE(sym->n_type)) { case DT_FCN: return "Function"; case DT_PTR: return "Pointer"; case DT_ARY: return "Array"; } - - sprintf (buff, _(": %d/%d"), sym->n_sclass, sym->n_type); - return buff; + + free (bufp); + n = asprintf (&bufp, _(": %d/%d"), sym->n_sclass, sym->n_type); + if (n < 0) + fatal ("%s", xstrerror (errno)); + return bufp; } /* Print symbol name NAME, read from ABFD, with printf format FORM, @@ -398,7 +397,7 @@ print_symname (const char *form, const char *name, bfd *abfd) { if (do_demangle && *name) { - char *res = bfd_demangle (abfd, name, DMGL_ANSI | DMGL_PARAMS); + char *res = bfd_demangle (abfd, name, demangle_flags); if (res != NULL) { @@ -469,7 +468,9 @@ filter_symbols (bfd *abfd, bfd_boolean is_dynamic, void *minisyms, if (sym == NULL) bfd_fatal (bfd_get_filename (abfd)); - if (strcmp (sym->name, "__gnu_lto_slim") == 0) + if (sym->name[0] == '_' + && sym->name[1] == '_' + && strcmp (sym->name + (sym->name[2] == '_'), "__gnu_lto_slim") == 0) non_fatal (_("%s: plugin needed to handle lto object"), bfd_get_filename (abfd)); @@ -674,7 +675,8 @@ size_forward1 (const void *P_x, const void *P_y) #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'))) @@ -766,9 +768,14 @@ sort_symbols_by_size (bfd *abfd, bfd_boolean is_dynamic, void *minisyms, sec = bfd_get_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; - 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 { @@ -844,8 +851,7 @@ static void print_symbol (bfd * abfd, asymbol * sym, bfd_vma ssize, - bfd * archive_bfd, - bfd_boolean is_synthetic) + bfd * archive_bfd) { symbol_info syminfo; struct extended_symbol_info info; @@ -858,8 +864,9 @@ print_symbol (bfd * abfd, info.sinfo = &syminfo; info.ssize = ssize; - /* Synthetic symbols do not have a full symbol type set of data available. */ - if (is_synthetic) + /* 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; @@ -872,6 +879,21 @@ print_symbol (bfd * abfd, format->print_symbol_info (&info, abfd); + if (with_symbol_versions) + { + const char * version_string = NULL; + bfd_boolean hidden = FALSE; + + if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0) + version_string = bfd_get_symbol_version_string (abfd, sym, &hidden); + + if (bfd_is_und_section (bfd_get_section (sym))) + hidden = TRUE; + + if (version_string && *version_string != '\0') + printf (hidden ? "@%s" : "@@%s", version_string); + } + if (line_numbers) { static asymbol **syms; @@ -993,13 +1015,11 @@ print_size_symbols (bfd * abfd, bfd_boolean is_dynamic, struct size_sym * symsizes, long symcount, - long synth_count, bfd * archive_bfd) { asymbol *store; struct size_sym *from; struct size_sym *fromend; - struct size_sym *fromsynth; store = bfd_make_empty_symbol (abfd); if (store == NULL) @@ -1007,7 +1027,6 @@ print_size_symbols (bfd * abfd, from = symsizes; fromend = from + symcount; - fromsynth = symsizes + (symcount - synth_count); for (; from < fromend; from++) { @@ -1017,7 +1036,7 @@ print_size_symbols (bfd * abfd, if (sym == NULL) bfd_fatal (bfd_get_filename (abfd)); - print_symbol (abfd, sym, from->size, archive_bfd, from >= fromsynth); + print_symbol (abfd, sym, from->size, archive_bfd); } } @@ -1026,9 +1045,7 @@ print_size_symbols (bfd * abfd, If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD. - SYMCOUNT is the number of symbols in MINISYMS and SYNTH_COUNT - is the number of these that are synthetic. Synthetic symbols, - if any are present, always come at the end of the MINISYMS. + SYMCOUNT is the number of symbols in MINISYMS. SIZE is the size of a symbol in MINISYMS. */ @@ -1037,14 +1054,12 @@ print_symbols (bfd * abfd, bfd_boolean is_dynamic, void * minisyms, long symcount, - long synth_count, unsigned int size, bfd * archive_bfd) { asymbol *store; bfd_byte *from; bfd_byte *fromend; - bfd_byte *fromsynth; store = bfd_make_empty_symbol (abfd); if (store == NULL) @@ -1052,7 +1067,6 @@ print_symbols (bfd * abfd, from = (bfd_byte *) minisyms; fromend = from + symcount * size; - fromsynth = (bfd_byte *) minisyms + ((symcount - synth_count) * size); for (; from < fromend; from += size) { @@ -1062,7 +1076,7 @@ print_symbols (bfd * abfd, if (sym == NULL) bfd_fatal (bfd_get_filename (abfd)); - print_symbol (abfd, sym, (bfd_vma) 0, archive_bfd, from >= fromsynth); + print_symbol (abfd, sym, (bfd_vma) 0, archive_bfd); } } @@ -1072,10 +1086,10 @@ static void display_rel_file (bfd *abfd, bfd *archive_bfd) { long symcount; - long synth_count = 0; void *minisyms; unsigned int size; struct size_sym *symsizes; + asymbol *synthsyms = NULL; if (! dynamic) { @@ -1106,11 +1120,11 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) if (show_synthetic && size == sizeof (asymbol *)) { - asymbol *synthsyms; asymbol **static_syms = NULL; asymbol **dyn_syms = NULL; long static_count = 0; long dyn_count = 0; + long synth_count; if (dynamic) { @@ -1138,17 +1152,14 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) if (synth_count > 0) { asymbol **symp; - void *new_mini; long i; - new_mini = xmalloc ((symcount + synth_count + 1) * sizeof (*symp)); - symp = (asymbol **) new_mini; - memcpy (symp, minisyms, symcount * sizeof (*symp)); - symp += symcount; + 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; - minisyms = new_mini; symcount += synth_count; } } @@ -1178,10 +1189,12 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) } if (! sort_by_size) - print_symbols (abfd, dynamic, minisyms, symcount, synth_count, size, archive_bfd); + print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd); else - print_size_symbols (abfd, dynamic, symsizes, symcount, synth_count, archive_bfd); + print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd); + if (synthsyms) + free (synthsyms); free (minisyms); free (symsizes); } @@ -1444,6 +1457,58 @@ print_symbol_filename_posix (bfd *archive_bfd, bfd *abfd) } } +/* Construct a formatting string for printing symbol values. */ + +static const char * +get_print_format (void) +{ + static const char * saved_format = NULL; + + /* See if we have already constructed the format. */ + if (saved_format) + return saved_format; + + 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"; + } + + 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 + } + + const char * radix = NULL; + switch (print_radix) + { + case 8: radix = "o"; break; + case 10: radix = "d"; break; + case 16: radix = "x"; break; + } + + saved_format = concat ("%", padding, length, radix, NULL); + return saved_format; +} + /* Print a symbol value. */ static void @@ -1452,12 +1517,12 @@ print_value (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma val) switch (print_width) { case 32: - printf (value_format_32bit, (unsigned long) val); + printf (get_print_format (), (unsigned long) val); break; case 64: #if BFD_HOST_64BIT_LONG || BFD_HOST_64BIT_LONG_LONG - printf (value_format_64bit, val); + printf (get_print_format (), val); #else /* We have a 64 bit value to print, but the host is only 32 bit. */ if (print_radix == 16) @@ -1628,7 +1693,8 @@ main (int argc, char **argv) expandargv (&argc, &argv); - bfd_init (); + 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:", @@ -1660,6 +1726,12 @@ main (int argc, char **argv) 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; @@ -1776,15 +1848,6 @@ main (int argc, char **argv) END_PROGRESS (program_name); -#ifdef HAVE_SBRK - if (show_stats) - { - char *lim = (char *) sbrk (0); - - non_fatal (_("data size %ld"), (long) (lim - (char *) &environ)); - } -#endif - exit (retval); return retval; }