X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Fnm.c;h=1b5122d56ab5c00fc710a775053eb2ee300b0665;hb=6db3031e5c8bbe94e2111633273d8e69e724220a;hp=e177d444efde547f4efa0b22a05d0014ca0700fb;hpb=fd3619828e94a24a92cddec42cbc0ab33352eeb4;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/nm.c b/binutils/nm.c index e177d444ef..1b5122d56a 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-2019 Free Software Foundation, Inc. + Copyright (C) 1991-2020 Free Software Foundation, Inc. This file is part of GNU Binutils. @@ -67,7 +67,6 @@ struct extended_symbol_info coff_symbol_type *coffinfo; /* 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) @@ -142,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; +static const char *print_format_string = NULL; /* Command options. */ @@ -393,8 +393,11 @@ get_coff_symbol_type (const struct internal_syment *sym) demangling it if requested. */ static void -print_symname (const char *form, const char *name, bfd *abfd) +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 *res = bfd_demangle (abfd, name, demangle_flags); @@ -408,6 +411,17 @@ print_symname (const char *form, const char *name, bfd *abfd) } 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); + } } static void @@ -432,7 +446,7 @@ print_symdef_entry (bfd *abfd) bfd_fatal ("bfd_get_elt_at_index"); if (thesym->name != (char *) NULL) { - print_symname ("%s", thesym->name, abfd); + print_symname ("%s", NULL, thesym->name, abfd); printf (" in %s\n", bfd_get_filename (elt)); } } @@ -893,7 +907,8 @@ print_symbol (bfd * abfd, bfd_boolean hidden = FALSE; if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0) - version_string = bfd_get_symbol_version_string (abfd, sym, &hidden); + version_string = bfd_get_symbol_version_string (abfd, sym, + TRUE, &hidden); if (bfd_is_und_section (bfd_asymbol_section (sym))) hidden = TRUE; @@ -1170,6 +1185,8 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) *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 @@ -1216,6 +1233,51 @@ display_rel_file (bfd *abfd, bfd *archive_bfd) free (symsizes); } +/* Construct a formatting string for printing symbol values. */ + +static const char * +get_print_format (void) +{ + 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; + } + + return concat ("%", padding, length, radix, NULL); +} + static void set_print_width (bfd *file) { @@ -1234,6 +1296,8 @@ set_print_width (bfd *file) else print_width = 32; } + free ((char *) print_format_string); + print_format_string = get_print_format (); } static void @@ -1474,58 +1538,6 @@ 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 @@ -1534,12 +1546,12 @@ print_value (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma val) switch (print_width) { case 32: - printf (get_print_format (), (unsigned long) val); + printf (print_format_string, (unsigned long) val); break; case 64: #if BFD_HOST_64BIT_LONG || BFD_HOST_64BIT_LONG_LONG - printf (get_print_format (), val); + 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) @@ -1608,13 +1620,13 @@ print_symbol_info_bsd (struct extended_symbol_info *info, bfd *abfd) 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 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))) { @@ -1669,7 +1681,7 @@ print_symbol_info_sysv (struct extended_symbol_info *info, bfd *abfd) static void 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)))