X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=binutils%2Fnm.c;h=fd3f73167e085defd041c04e1a3f487ed93c57f0;hb=92434a14b97bf07546701613a16aaf4d8a3b3eca;hp=74350d74679e7cf1e24029399c9a2a853e7ec48b;hpb=2da42df615c0489291f8d3e1ce873642755a49c6;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/nm.c b/binutils/nm.c index 74350d7467..fd3f73167e 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -1,13 +1,11 @@ /* nm.c -- Describe symbol table of a rel file. - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003 - Free Software Foundation, Inc. + Copyright (C) 1991-2019 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, @@ -17,13 +15,12 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + 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 +28,16 @@ #include "libiberty.h" #include "elf-bfd.h" #include "elf/common.h" +#define DO_NOT_DEFINE_AOUTHDR +#define DO_NOT_DEFINE_FILHDR +#define DO_NOT_DEFINE_LINENO +#define DO_NOT_DEFINE_SCNHDR +#include "coff/external.h" +#include "coff/internal.h" +#include "libcoff.h" +#include "bucomm.h" +#include "plugin-api.h" +#include "plugin.h" /* When sorting by size, we use this structure to hold the size and a pointer to the minisymbol. */ @@ -57,6 +64,7 @@ struct extended_symbol_info symbol_info *sinfo; bfd_vma ssize; elf_symbol_type *elfinfo; + coff_symbol_type *coffinfo; /* FIXME: We should add more fields for Type, Line, Section. */ }; #define SYM_NAME(sym) (sym->sinfo->name) @@ -68,31 +76,6 @@ struct extended_symbol_info #define SYM_SIZE(sym) \ (sym->elfinfo ? sym->elfinfo->internal_elf_sym.st_size: sym->ssize) -static void usage (FILE *, int); -static void set_print_radix (char *); -static void set_output_format (char *); -static void display_archive (bfd *); -static bfd_boolean display_file (char *); -static void display_rel_file (bfd *, bfd *); -static long filter_symbols (bfd *, bfd_boolean, void *, long, unsigned int); -static long sort_symbols_by_size - (bfd *, bfd_boolean, void *, long, unsigned int, struct size_sym **); -static void print_symbols - (bfd *, bfd_boolean, void *, long, unsigned int, bfd *); -static void print_size_symbols - (bfd *, bfd_boolean, struct size_sym *, long, bfd *); -static void print_symname (const char *, const char *, bfd *); -static void print_symbol (bfd *, asymbol *, bfd_vma ssize, bfd *); -static void print_symdef_entry (bfd *); - -/* The sorting functions. */ -static int numeric_forward (const void *, const void *); -static int numeric_reverse (const void *, const void *); -static int non_numeric_forward (const void *, const void *); -static int non_numeric_reverse (const void *, const void *); -static int size_forward1 (const void *, const void *); -static int size_forward2 (const void *, const void *); - /* The output formatting functions. */ static void print_object_filename_bsd (char *); static void print_object_filename_sysv (char *); @@ -110,8 +93,6 @@ static void print_value (bfd *, bfd_vma); static void print_symbol_info_bsd (struct extended_symbol_info *, bfd *); static void print_symbol_info_sysv (struct extended_symbol_info *, bfd *); static void print_symbol_info_posix (struct extended_symbol_info *, bfd *); -static void get_relocs (bfd *, asection *, void *); -static const char * get_symbol_type (unsigned int); /* Support for different output formats. */ struct output_fns @@ -160,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. */ @@ -176,40 +158,42 @@ 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. */ -#ifndef BFD64 -static char value_format[] = "%08lx"; -#else -#if BFD_HOST_64BIT_LONG -static char value_format[] = "%016lx"; -#else -/* We don't use value_format for this case. */ -#endif -#endif -#ifdef BFD64 -static int print_width = 16; -#else -static int print_width = 8; -#endif +static int print_width = 0; static int print_radix = 16; /* Print formats for printing stab info. */ static char other_format[] = "%02x"; static char desc_format[] = "%04x"; static char *target = NULL; +#if BFD_SUPPORTS_PLUGINS +static const char *plugin_target = "plugin"; +#else +static const char *plugin_target = NULL; +#endif /* Used to cache the line numbers for a BFD. */ static bfd *lineno_cache_bfd; static bfd *lineno_cache_rel_bfd; -#define OPTION_TARGET 200 +enum long_option_values +{ + OPTION_TARGET = 200, + OPTION_PLUGIN, + OPTION_SIZE_SORT, + OPTION_RECURSE_LIMIT, + OPTION_NO_RECURSE_LIMIT +}; static struct option long_options[] = { @@ -222,26 +206,33 @@ 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-sort", no_argument, &no_sort, 1}, - {"numeric-sort", no_argument, &sort_numerically, 1}, + {"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}, {"portability", no_argument, 0, 'P'}, {"print-armap", no_argument, &print_armap, 1}, {"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, &sort_by_size, 1}, - {"stats", no_argument, &show_stats, 1}, + {"size-sort", no_argument, 0, OPTION_SIZE_SORT}, + {"special-syms", no_argument, &allow_special_symbols, 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); @@ -255,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\ @@ -267,19 +260,28 @@ 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\ + -r, --reverse-sort Reverse the sense of the sort\n")); +#if BFD_SUPPORTS_PLUGINS + fprintf (stream, _("\ + --plugin NAME Load the specified plugin\n")); +#endif + 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\ + --synthetic Display synthetic symbols as well\n\ -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\ -V, --version Display this program's version number\n\ \n")); list_supported_targets (program_name, stream); - if (status == 0) + if (REPORT_BUGS_TO[0] && status == 0) fprintf (stream, _("Report bugs to %s.\n"), REPORT_BUGS_TO); exit (status); } @@ -291,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; -#ifndef BFD64 - value_format[4] = *radix; -#else -#if BFD_HOST_64BIT_LONG - value_format[5] = *radix; -#else - /* This case requires special handling for octal and decimal - printing. */ -#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 @@ -339,307 +327,197 @@ set_output_format (char *f) fatal (_("%s: invalid output format"), f); } format = &formats[i]; + print_format = i; } -int main (int, char **); - -int -main (int argc, char **argv) +static const char * +get_elf_symbol_type (unsigned int type) { - int c; - int retval; - -#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) - setlocale (LC_MESSAGES, ""); -#endif -#if defined (HAVE_SETLOCALE) - setlocale (LC_CTYPE, ""); - setlocale (LC_COLLATE, ""); -#endif - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); - - program_name = *argv; - xmalloc_set_program_name (program_name); - - START_PROGRESS (program_name, 0); + static char *bufp; + int n; - bfd_init (); - set_default_bfd_target (); - - while ((c = getopt_long (argc, argv, "aABCDef:gHhlnopPrSst:uvVvX:", - long_options, (int *) 0)) != EOF) + switch (type) { - switch (c) - { - case 'a': - print_debug_syms = 1; - break; - case 'A': - case 'o': - filename_per_symbol = 1; - break; - case 'B': /* For MIPS compatibility. */ - set_output_format ("bsd"); - break; - case 'C': - do_demangle = 1; - if (optarg != NULL) - { - enum demangling_styles style; - - style = cplus_demangle_name_to_style (optarg); - if (style == unknown_demangling) - fatal (_("unknown demangling style `%s'"), - optarg); - - cplus_demangle_set_style (style); - } - break; - case 'D': - dynamic = 1; - break; - case 'e': - /* Ignored for HP/UX compatibility. */ - break; - case 'f': - set_output_format (optarg); - break; - case 'g': - external_only = 1; - break; - case 'H': - case 'h': - usage (stdout, 0); - case 'l': - line_numbers = 1; - break; - case 'n': - case 'v': - sort_numerically = 1; - break; - case 'p': - no_sort = 1; - break; - case 'P': - set_output_format ("posix"); - break; - case 'r': - reverse_sort = 1; - break; - case 's': - print_armap = 1; - break; - case 'S': - print_size = 1; - break; - case 't': - set_print_radix (optarg); - break; - case 'u': - undefined_only = 1; - break; - case 'V': - show_version = 1; - break; - case 'X': - /* Ignored for (partial) AIX compatibility. On AIX, the - argument has values 32, 64, or 32_64, and specfies that - only 32-bit, only 64-bit, or both kinds of objects should - be examined. The default is 32. So plain AIX nm on a - library archive with both kinds of objects will ignore - the 64-bit ones. For GNU nm, the default is and always - has been -X 32_64, and other options are not supported. */ - if (strcmp (optarg, "32_64") != 0) - fatal (_("Only -X 32_64 is supported")); - break; - - case OPTION_TARGET: /* --target */ - target = optarg; - break; - - case 0: /* A long option that just sets a flag. */ - break; - - default: - usage (stderr, 1); - } + case STT_NOTYPE: return "NOTYPE"; + case STT_OBJECT: return "OBJECT"; + case STT_FUNC: return "FUNC"; + case STT_SECTION: return "SECTION"; + case STT_FILE: return "FILE"; + case STT_COMMON: return "COMMON"; + case STT_TLS: return "TLS"; } - if (show_version) - print_version ("nm"); + 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; +} - if (sort_by_size && undefined_only) +static const char * +get_coff_symbol_type (const struct internal_syment *sym) +{ + static char *bufp; + int n; + + switch (sym->n_sclass) { - non_fatal (_("Using the --size-sort and --undefined-only options together")); - non_fatal (_("will produce no output, since undefined symbols have no size.")); - return 0; + case C_BLOCK: return "Block"; + case C_FILE: return "File"; + case C_LINE: return "Line"; } - /* OK, all options now parsed. If no filename specified, do a.out. */ - if (optind == argc) - return !display_file ("a.out"); - - retval = 0; - - if (argc - optind > 1) - filename_per_file = 1; + if (!sym->n_type) + return "None"; - /* We were given several filenames to do. */ - while (optind < argc) + switch (DTYPE(sym->n_type)) { - PROGRESS (1); - if (!display_file (argv[optind++])) - retval++; + case DT_FCN: return "Function"; + case DT_PTR: return "Pointer"; + case DT_ARY: return "Array"; } - END_PROGRESS (program_name); + 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, + demangling it if requested. */ -#ifdef HAVE_SBRK - if (show_stats) +static void +print_symname (const char *form, const char *name, bfd *abfd) +{ + if (do_demangle && *name) { - char *lim = (char *) sbrk (0); + char *res = bfd_demangle (abfd, name, demangle_flags); - non_fatal (_("data size %ld"), (long) (lim - (char *) &environ)); + if (res != NULL) + { + printf (form, res); + free (res); + return; + } } -#endif - exit (retval); - return retval; + printf (form, name); } - -static const char * -get_symbol_type (unsigned int type) + +static void +print_symdef_entry (bfd *abfd) { - static char buff [32]; + symindex idx = BFD_NO_MORE_SYMBOLS; + carsym *thesym; + bfd_boolean everprinted = FALSE; - switch (type) + for (idx = bfd_get_next_mapent (abfd, idx, &thesym); + idx != BFD_NO_MORE_SYMBOLS; + idx = bfd_get_next_mapent (abfd, idx, &thesym)) { - case STT_NOTYPE: return "NOTYPE"; - case STT_OBJECT: return "OBJECT"; - case STT_FUNC: return "FUNC"; - case STT_SECTION: return "SECTION"; - 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; + bfd *elt; + if (!everprinted) + { + printf (_("\nArchive index:\n")); + everprinted = TRUE; + } + elt = bfd_get_elt_at_index (abfd, idx); + if (elt == NULL) + bfd_fatal ("bfd_get_elt_at_index"); + if (thesym->name != (char *) NULL) + { + print_symname ("%s", thesym->name, abfd); + printf (" in %s\n", bfd_get_filename (elt)); + } } } + +/* Choose which symbol entries to print; + compact them downward to get rid of the rest. + Return the number of symbols to be printed. */ -static void -display_archive (bfd *file) +static long +filter_symbols (bfd *abfd, bfd_boolean is_dynamic, void *minisyms, + long symcount, unsigned int size) { - bfd *arfile = NULL; - bfd *last_arfile = NULL; - char **matching; + bfd_byte *from, *fromend, *to; + asymbol *store; - (*format->print_archive_filename) (bfd_get_filename (file)); + store = bfd_make_empty_symbol (abfd); + if (store == NULL) + bfd_fatal (bfd_get_filename (abfd)); - if (print_armap) - print_symdef_entry (file); + from = (bfd_byte *) minisyms; + fromend = from + symcount * size; + to = (bfd_byte *) minisyms; - for (;;) + for (; from < fromend; from += size) { + int keep = 0; + asymbol *sym; + PROGRESS (1); - arfile = bfd_openr_next_archived_file (file, arfile); + sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, (const void *) from, store); + if (sym == NULL) + bfd_fatal (bfd_get_filename (abfd)); - if (arfile == NULL) - { - if (bfd_get_error () != bfd_error_no_more_archived_files) - bfd_fatal (bfd_get_filename (file)); - break; - } - - if (bfd_check_format_matches (arfile, bfd_object, &matching)) - { - char buf[30]; + 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)); - bfd_sprintf_vma (arfile, buf, (bfd_vma) -1); - print_width = strlen (buf); - (*format->print_archive_member) (bfd_get_filename (file), - bfd_get_filename (arfile)); - display_rel_file (arfile, file); - } + if (undefined_only) + keep = bfd_is_und_section (sym->section); + else if (external_only) + /* PR binutls/12753: Unique symbols are global too. */ + keep = ((sym->flags & (BSF_GLOBAL + | BSF_WEAK + | BSF_GNU_UNIQUE)) != 0 + || bfd_is_und_section (sym->section) + || bfd_is_com_section (sym->section)); else - { - bfd_nonfatal (bfd_get_filename (arfile)); - if (bfd_get_error () == bfd_error_file_ambiguously_recognized) - { - list_matching_formats (matching); - free (matching); - } - } - - if (last_arfile != NULL) - { - bfd_close (last_arfile); - lineno_cache_bfd = NULL; - lineno_cache_rel_bfd = NULL; - } - last_arfile = arfile; - } + keep = 1; - if (last_arfile != NULL) - { - bfd_close (last_arfile); - lineno_cache_bfd = NULL; - lineno_cache_rel_bfd = NULL; - } -} + if (keep + && ! print_debug_syms + && (sym->flags & BSF_DEBUGGING) != 0) + keep = 0; -static bfd_boolean -display_file (char *filename) -{ - bfd_boolean retval = TRUE; - bfd *file; - char **matching; + if (keep + && sort_by_size + && (bfd_is_abs_section (sym->section) + || bfd_is_und_section (sym->section))) + keep = 0; - file = bfd_openr (filename, target); - if (file == NULL) - { - bfd_nonfatal (filename); - return FALSE; - } + if (keep + && defined_only) + { + if (bfd_is_und_section (sym->section)) + keep = 0; + } - if (bfd_check_format (file, bfd_archive)) - { - display_archive (file); - } - else if (bfd_check_format_matches (file, bfd_object, &matching)) - { - char buf[30]; + if (keep + && bfd_is_target_special_symbol (abfd, sym) + && ! allow_special_symbols) + keep = 0; - bfd_sprintf_vma (file, buf, (bfd_vma) -1); - print_width = strlen (buf); - (*format->print_object_filename) (filename); - display_rel_file (file, NULL); - } - else - { - bfd_nonfatal (filename); - if (bfd_get_error () == bfd_error_file_ambiguously_recognized) + if (keep) { - list_matching_formats (matching); - free (matching); + if (to != from) + memcpy (to, from, size); + to += size; } - retval = FALSE; } - if (!bfd_close (file)) - bfd_fatal (filename); - - lineno_cache_bfd = NULL; - lineno_cache_rel_bfd = NULL; - - return retval; + return (to - (bfd_byte *) minisyms) / size; } /* These globals are used to pass information into the sorting @@ -656,39 +534,6 @@ static asymbol *sort_y; defined symbols with zero values. Common symbols are not treated specially -- i.e., their sizes are used as their "values". */ -static int -numeric_forward (const void *P_x, const void *P_y) -{ - asymbol *x, *y; - asection *xs, *ys; - - x = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_x, sort_x); - y = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_y, sort_y); - if (x == NULL || y == NULL) - bfd_fatal (bfd_get_filename (sort_bfd)); - - xs = bfd_get_section (x); - ys = bfd_get_section (y); - - if (bfd_is_und_section (xs)) - { - if (! bfd_is_und_section (ys)) - return -1; - } - else if (bfd_is_und_section (ys)) - return 1; - else if (valueof (x) != valueof (y)) - return valueof (x) < valueof (y) ? -1 : 1; - - return non_numeric_forward (P_x, P_y); -} - -static int -numeric_reverse (const void *x, const void *y) -{ - return - numeric_forward (x, y); -} - static int non_numeric_forward (const void *P_x, const void *P_y) { @@ -728,6 +573,39 @@ non_numeric_reverse (const void *x, const void *y) return - non_numeric_forward (x, y); } +static int +numeric_forward (const void *P_x, const void *P_y) +{ + asymbol *x, *y; + asection *xs, *ys; + + x = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_x, sort_x); + y = bfd_minisymbol_to_symbol (sort_bfd, sort_dynamic, P_y, sort_y); + if (x == NULL || y == NULL) + bfd_fatal (bfd_get_filename (sort_bfd)); + + xs = bfd_get_section (x); + ys = bfd_get_section (y); + + if (bfd_is_und_section (xs)) + { + if (! bfd_is_und_section (ys)) + return -1; + } + else if (bfd_is_und_section (ys)) + return 1; + else if (valueof (x) != valueof (y)) + return valueof (x) < valueof (y) ? -1 : 1; + + return non_numeric_forward (P_x, P_y); +} + +static int +numeric_reverse (const void *x, const void *y) +{ + return - numeric_forward (x, y); +} + static int (*(sorters[2][2])) (const void *, const void *) = { { non_numeric_forward, non_numeric_reverse }, @@ -797,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'))) @@ -835,7 +714,7 @@ size_forward2 (const void *P_x, const void *P_y) 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) { @@ -862,7 +741,7 @@ sort_symbols_by_size (bfd *abfd, bfd_boolean dynamic, void *minisyms, 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)); @@ -878,7 +757,7 @@ sort_symbols_by_size (bfd *abfd, bfd_boolean dynamic, void *minisyms, if (from + size < fromend) { next = bfd_minisymbol_to_symbol (abfd, - dynamic, + is_dynamic, (const void *) (from + size), store_next); if (next == NULL) @@ -889,9 +768,14 @@ sort_symbols_by_size (bfd *abfd, bfd_boolean 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 { @@ -925,237 +809,90 @@ sort_symbols_by_size (bfd *abfd, bfd_boolean dynamic, void *minisyms, return symcount; } - -/* If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD. */ + +/* This function is used to get the relocs for a particular section. + It is called via bfd_map_over_sections. */ static void -display_rel_file (bfd *abfd, bfd *archive_bfd) +get_relocs (bfd *abfd, asection *sec, void *dataarg) { - long symcount; - void *minisyms; - unsigned int size; - struct size_sym *symsizes; - - if (! dynamic) - { - if (!(bfd_get_file_flags (abfd) & HAS_SYMS)) - { - non_fatal (_("%s: no symbols"), bfd_get_filename (abfd)); - return; - } - } + struct get_relocs_info *data = (struct get_relocs_info *) dataarg; - symcount = bfd_read_minisymbols (abfd, dynamic, &minisyms, &size); - if (symcount < 0) - bfd_fatal (bfd_get_filename (abfd)); + *data->secs = sec; - if (symcount == 0) + if ((sec->flags & SEC_RELOC) == 0) { - non_fatal (_("%s: no symbols"), bfd_get_filename (abfd)); - return; + *data->relocs = NULL; + *data->relcount = 0; } - - /* Discard the symbols we don't want to print. - It's OK to do this in place; we'll free the storage anyway - (after printing). */ - - symcount = filter_symbols (abfd, dynamic, minisyms, symcount, size); - - symsizes = NULL; - if (! no_sort) + else { - sort_bfd = abfd; - sort_dynamic = dynamic; - sort_x = bfd_make_empty_symbol (abfd); - sort_y = bfd_make_empty_symbol (abfd); - if (sort_x == NULL || sort_y == NULL) + long relsize; + + relsize = bfd_get_reloc_upper_bound (abfd, sec); + if (relsize < 0) bfd_fatal (bfd_get_filename (abfd)); - if (! sort_by_size) - qsort (minisyms, symcount, size, - sorters[sort_numerically][reverse_sort]); - else - symcount = sort_symbols_by_size (abfd, dynamic, minisyms, symcount, - size, &symsizes); + *data->relocs = (arelent **) xmalloc (relsize); + *data->relcount = bfd_canonicalize_reloc (abfd, sec, *data->relocs, + data->syms); + if (*data->relcount < 0) + bfd_fatal (bfd_get_filename (abfd)); } - if (! sort_by_size) - print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd); - else - print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd); - - free (minisyms); + ++data->secs; + ++data->relocs; + ++data->relcount; } - -/* Choose which symbol entries to print; - compact them downward to get rid of the rest. - Return the number of symbols to be printed. */ -static long -filter_symbols (bfd *abfd, bfd_boolean dynamic, void *minisyms, - long symcount, unsigned int size) -{ - bfd_byte *from, *fromend, *to; - asymbol *store; +/* Print a single symbol. */ - store = bfd_make_empty_symbol (abfd); - if (store == NULL) - bfd_fatal (bfd_get_filename (abfd)); +static void +print_symbol (bfd * abfd, + asymbol * sym, + bfd_vma ssize, + bfd * archive_bfd) +{ + symbol_info syminfo; + struct extended_symbol_info info; - from = (bfd_byte *) minisyms; - fromend = from + symcount * size; - to = (bfd_byte *) minisyms; + PROGRESS (1); - for (; from < fromend; from += size) - { - int keep = 0; - asymbol *sym; + format->print_symbol_filename (archive_bfd, abfd); - PROGRESS (1); + bfd_get_symbol_info (abfd, sym, &syminfo); - sym = bfd_minisymbol_to_symbol (abfd, dynamic, (const void *) from, store); - if (sym == NULL) - bfd_fatal (bfd_get_filename (abfd)); - - if (undefined_only) - keep = bfd_is_und_section (sym->section); - else if (external_only) - keep = ((sym->flags & BSF_GLOBAL) != 0 - || (sym->flags & BSF_WEAK) != 0 - || bfd_is_und_section (sym->section) - || bfd_is_com_section (sym->section)); - else - keep = 1; - - if (keep - && ! print_debug_syms - && (sym->flags & BSF_DEBUGGING) != 0) - keep = 0; - - if (keep - && sort_by_size - && (bfd_is_abs_section (sym->section) - || bfd_is_und_section (sym->section))) - keep = 0; - - if (keep - && defined_only) - { - if (bfd_is_und_section (sym->section)) - keep = 0; - } - - if (keep) - { - memcpy (to, from, size); - to += size; - } - } - - return (to - (bfd_byte *) minisyms) / size; -} - -/* Print symbol name NAME, read from ABFD, with printf format FORMAT, - demangling it if requested. */ - -static void -print_symname (const char *format, const char *name, bfd *abfd) -{ - if (do_demangle && *name) + info.sinfo = &syminfo; + info.ssize = ssize; + /* 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) { - char *res = demangle (abfd, name); - - printf (format, res); - free (res); - return; + info.elfinfo = NULL; + info.coffinfo = NULL; } - - printf (format, name); -} - -/* Print the symbols. If ARCHIVE_BFD is non-NULL, it is the archive - containing ABFD. */ - -static void -print_symbols (bfd *abfd, bfd_boolean dynamic, void *minisyms, long symcount, - unsigned int size, bfd *archive_bfd) -{ - asymbol *store; - bfd_byte *from, *fromend; - - store = bfd_make_empty_symbol (abfd); - if (store == NULL) - bfd_fatal (bfd_get_filename (abfd)); - - from = (bfd_byte *) minisyms; - fromend = from + symcount * size; - for (; from < fromend; from += size) + else { - asymbol *sym; - - sym = bfd_minisymbol_to_symbol (abfd, dynamic, from, store); - if (sym == NULL) - bfd_fatal (bfd_get_filename (abfd)); - - print_symbol (abfd, sym, (bfd_vma) 0, archive_bfd); + info.elfinfo = elf_symbol_from (abfd, sym); + info.coffinfo = coff_symbol_from (sym); } -} - -/* Print the symbols when sorting by size. */ -static void -print_size_symbols (bfd *abfd, bfd_boolean dynamic, - struct size_sym *symsizes, long symcount, - bfd *archive_bfd) -{ - asymbol *store; - struct size_sym *from, *fromend; - - store = bfd_make_empty_symbol (abfd); - if (store == NULL) - bfd_fatal (bfd_get_filename (abfd)); + format->print_symbol_info (&info, abfd); - from = symsizes; - fromend = from + symcount; - for (; from < fromend; from++) + if (with_symbol_versions) { - asymbol *sym; - bfd_vma ssize; + const char * version_string = NULL; + bfd_boolean hidden = FALSE; - sym = bfd_minisymbol_to_symbol (abfd, dynamic, from->minisym, store); - if (sym == NULL) - bfd_fatal (bfd_get_filename (abfd)); + if ((sym->flags & (BSF_SECTION_SYM | BSF_SYNTHETIC)) == 0) + version_string = bfd_get_symbol_version_string (abfd, sym, &hidden); - /* For elf we have already computed the correct symbol size. */ - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) - ssize = from->size; - else - ssize = from->size - bfd_section_vma (abfd, bfd_get_section (sym)); + if (bfd_is_und_section (bfd_get_section (sym))) + hidden = TRUE; - print_symbol (abfd, sym, ssize, archive_bfd); + if (version_string && *version_string != '\0') + printf (hidden ? "@%s" : "@@%s", version_string); } -} - -/* Print a single symbol. */ - -static void -print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd) -{ - symbol_info syminfo; - struct extended_symbol_info info; - - PROGRESS (1); - - (*format->print_symbol_filename) (archive_bfd, abfd); - - bfd_get_symbol_info (abfd, sym, &syminfo); - info.sinfo = &syminfo; - info.ssize = ssize; - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) - info.elfinfo = (elf_symbol_type *) sym; - else - info.elfinfo = NULL; - (*format->print_symbol_info) (&info, abfd); if (line_numbers) { @@ -1212,7 +949,7 @@ print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd) if (relocs == NULL) { - struct get_relocs_info info; + struct get_relocs_info rinfo; seccount = bfd_count_sections (abfd); @@ -1220,11 +957,11 @@ print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd) 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); + rinfo.secs = secs; + rinfo.relocs = relocs; + rinfo.relcount = relcount; + rinfo.syms = syms; + bfd_map_over_sections (abfd, get_relocs, (void *) &rinfo); lineno_cache_rel_bfd = abfd; } @@ -1258,18 +995,340 @@ print_symbol (bfd *abfd, asymbol *sym, bfd_vma ssize, bfd *archive_bfd) } else if (bfd_get_section (sym)->owner == abfd) { - if (bfd_find_nearest_line (abfd, bfd_get_section (sym), syms, - sym->value, &filename, &functionname, - &lineno) - && filename != NULL - && lineno != 0) - { - printf ("\t%s:%u", filename, lineno); - } + if ((bfd_find_line (abfd, syms, sym, &filename, &lineno) + || bfd_find_nearest_line (abfd, bfd_get_section (sym), + syms, sym->value, &filename, + &functionname, &lineno)) + && filename != NULL + && lineno != 0) + printf ("\t%s:%u", filename, lineno); + } + } + + putchar ('\n'); +} + +/* Print the symbols when sorting by size. */ + +static void +print_size_symbols (bfd * abfd, + bfd_boolean is_dynamic, + struct size_sym * symsizes, + long symcount, + bfd * archive_bfd) +{ + asymbol *store; + struct size_sym *from; + struct size_sym *fromend; + + store = bfd_make_empty_symbol (abfd); + if (store == NULL) + bfd_fatal (bfd_get_filename (abfd)); + + from = symsizes; + fromend = from + symcount; + + for (; from < fromend; from++) + { + asymbol *sym; + + sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, from->minisym, store); + if (sym == NULL) + bfd_fatal (bfd_get_filename (abfd)); + + print_symbol (abfd, sym, from->size, archive_bfd); + } +} + + +/* Print the symbols of ABFD that are held in MINISYMS. + + If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD. + + SYMCOUNT is the number of symbols in MINISYMS. + + SIZE is the size of a symbol in MINISYMS. */ + +static void +print_symbols (bfd * abfd, + bfd_boolean is_dynamic, + void * minisyms, + long symcount, + unsigned int size, + bfd * archive_bfd) +{ + asymbol *store; + bfd_byte *from; + bfd_byte *fromend; + + store = bfd_make_empty_symbol (abfd); + if (store == NULL) + bfd_fatal (bfd_get_filename (abfd)); + + from = (bfd_byte *) minisyms; + fromend = from + symcount * size; + + for (; from < fromend; from += size) + { + asymbol *sym; + + sym = bfd_minisymbol_to_symbol (abfd, is_dynamic, from, store); + if (sym == NULL) + bfd_fatal (bfd_get_filename (abfd)); + + print_symbol (abfd, sym, (bfd_vma) 0, archive_bfd); + } +} + +/* If ARCHIVE_BFD is non-NULL, it is the archive containing ABFD. */ + +static void +display_rel_file (bfd *abfd, bfd *archive_bfd) +{ + long symcount; + void *minisyms; + unsigned int size; + struct size_sym *symsizes; + asymbol *synthsyms = NULL; + + if (! dynamic) + { + if (!(bfd_get_file_flags (abfd) & HAS_SYMS)) + { + non_fatal (_("%s: no symbols"), bfd_get_filename (abfd)); + return; + } + } + + symcount = bfd_read_minisymbols (abfd, dynamic, &minisyms, &size); + if (symcount < 0) + { + if (dynamic && bfd_get_error () == bfd_error_no_symbols) + { + non_fatal (_("%s: no symbols"), bfd_get_filename (abfd)); + return; + } + + bfd_fatal (bfd_get_filename (abfd)); + } + + if (symcount == 0) + { + non_fatal (_("%s: no symbols"), bfd_get_filename (abfd)); + return; + } + + if (show_synthetic && size == sizeof (asymbol *)) + { + asymbol **static_syms = NULL; + asymbol **dyn_syms = NULL; + long static_count = 0; + long dyn_count = 0; + long synth_count; + + if (dynamic) + { + dyn_count = symcount; + dyn_syms = (asymbol **) minisyms; + } + else + { + long storage = bfd_get_dynamic_symtab_upper_bound (abfd); + + static_count = symcount; + static_syms = (asymbol **) minisyms; + + if (storage > 0) + { + dyn_syms = (asymbol **) xmalloc (storage); + dyn_count = bfd_canonicalize_dynamic_symtab (abfd, dyn_syms); + if (dyn_count < 0) + bfd_fatal (bfd_get_filename (abfd)); + } + } + + synth_count = bfd_get_synthetic_symtab (abfd, static_count, static_syms, + dyn_count, dyn_syms, &synthsyms); + if (synth_count > 0) + { + asymbol **symp; + long i; + + 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; + symcount += synth_count; + } + } + + /* Discard the symbols we don't want to print. + It's OK to do this in place; we'll free the storage anyway + (after printing). */ + + symcount = filter_symbols (abfd, dynamic, minisyms, symcount, size); + + symsizes = NULL; + if (! no_sort) + { + sort_bfd = abfd; + sort_dynamic = dynamic; + sort_x = bfd_make_empty_symbol (abfd); + sort_y = bfd_make_empty_symbol (abfd); + if (sort_x == NULL || sort_y == NULL) + bfd_fatal (bfd_get_filename (abfd)); + + if (! sort_by_size) + qsort (minisyms, symcount, size, + sorters[sort_numerically][reverse_sort]); + else + symcount = sort_symbols_by_size (abfd, dynamic, minisyms, symcount, + size, &symsizes); + } + + if (! sort_by_size) + print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd); + else + print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd); + + if (synthsyms) + free (synthsyms); + free (minisyms); + free (symsizes); +} + +static void +set_print_width (bfd *file) +{ + print_width = bfd_get_arch_size (file); + + if (print_width == -1) + { + /* PR binutils/4292 + Guess the target's bitsize based on its name. + We assume here than any 64-bit format will include + "64" somewhere in its name. The only known exception + is the MMO object file format. */ + if (strstr (bfd_get_target (file), "64") != NULL + || strcmp (bfd_get_target (file), "mmo") == 0) + print_width = 64; + else + print_width = 32; + } +} + +static void +display_archive (bfd *file) +{ + bfd *arfile = NULL; + bfd *last_arfile = NULL; + char **matching; + + format->print_archive_filename (bfd_get_filename (file)); + + if (print_armap) + print_symdef_entry (file); + + for (;;) + { + PROGRESS (1); + + arfile = bfd_openr_next_archived_file (file, arfile); + + if (arfile == NULL) + { + if (bfd_get_error () != bfd_error_no_more_archived_files) + bfd_fatal (bfd_get_filename (file)); + break; + } + + if (bfd_check_format_matches (arfile, bfd_object, &matching)) + { + set_print_width (arfile); + format->print_archive_member (bfd_get_filename (file), + bfd_get_filename (arfile)); + display_rel_file (arfile, file); + } + else + { + bfd_nonfatal (bfd_get_filename (arfile)); + if (bfd_get_error () == bfd_error_file_ambiguously_recognized) + { + list_matching_formats (matching); + free (matching); + } + } + + if (last_arfile != NULL) + { + bfd_close (last_arfile); + lineno_cache_bfd = NULL; + lineno_cache_rel_bfd = NULL; + if (arfile == last_arfile) + return; + } + last_arfile = arfile; + } + + if (last_arfile != NULL) + { + bfd_close (last_arfile); + lineno_cache_bfd = NULL; + lineno_cache_rel_bfd = NULL; + } +} + +static bfd_boolean +display_file (char *filename) +{ + bfd_boolean retval = TRUE; + bfd *file; + char **matching; + + if (get_file_size (filename) < 1) + return FALSE; + + file = bfd_openr (filename, target ? target : plugin_target); + 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); + } + else if (bfd_check_format_matches (file, bfd_object, &matching)) + { + set_print_width (file); + format->print_object_filename (filename); + display_rel_file (file, NULL); + } + else + { + bfd_nonfatal (filename); + if (bfd_get_error () == bfd_error_file_ambiguously_recognized) + { + list_matching_formats (matching); + free (matching); } + retval = FALSE; } - putchar ('\n'); + if (!bfd_close (file)) + bfd_fatal (filename); + + lineno_cache_bfd = NULL; + lineno_cache_rel_bfd = NULL; + + return retval; } /* The following 3 groups of functions are called unconditionally, @@ -1294,7 +1353,7 @@ print_object_filename_sysv (char *filename) printf (_("\n\nUndefined symbols from %s:\n\n"), filename); else printf (_("\n\nSymbols from %s:\n\n"), filename); - if (print_width == 8) + if (print_width == 32) printf (_("\ Name Value Class Type Size Line Section\n\n")); else @@ -1345,7 +1404,7 @@ print_archive_member_sysv (char *archive, const char *filename) printf (_("\n\nUndefined symbols from %s[%s]:\n\n"), archive, filename); else printf (_("\n\nSymbols from %s[%s]:\n\n"), archive, filename); - if (print_width == 8) + if (print_width == 32) printf (_("\ Name Value Class Type Size Line Section\n\n")); else @@ -1398,34 +1457,99 @@ 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 print_value (bfd *abfd ATTRIBUTE_UNUSED, bfd_vma val) { -#if ! defined (BFD64) || BFD_HOST_64BIT_LONG - printf (value_format, val); -#else - /* We have a 64 bit value to print, but the host is only 32 bit. */ - if (print_radix == 16) - bfd_fprintf_vma (abfd, stdout, val); - else + switch (print_width) { - char buf[30]; - char *s; + case 32: + printf (get_print_format (), (unsigned long) val); + break; - s = buf + sizeof buf; - *--s = '\0'; - while (val > 0) + case 64: +#if BFD_HOST_64BIT_LONG || BFD_HOST_64BIT_LONG_LONG + 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) + bfd_fprintf_vma (abfd, stdout, val); + else { - *--s = (val % print_radix) + '0'; - val /= print_radix; + char buf[30]; + char *s; + + s = buf + sizeof buf; + *--s = '\0'; + while (val > 0) + { + *--s = (val % print_radix) + '0'; + val /= print_radix; + } + while ((buf + sizeof buf - 1) - s < 16) + *--s = '0'; + printf ("%s", s); } - while ((buf + sizeof buf - 1) - s < 16) - *--s = '0'; - printf ("%s", s); - } #endif + break; + + default: + fatal (_("Print width has not been initialized (%d)"), print_width); + break; + } } /* Print a line of information about a symbol. */ @@ -1435,21 +1559,20 @@ print_symbol_info_bsd (struct extended_symbol_info *info, bfd *abfd) { if (bfd_is_undefined_symclass (SYM_TYPE (info))) { - if (print_width == 16) + if (print_width == 64) printf (" "); printf (" "); } else { /* Normally we print the value of the symbol. If we are printing the - size or sorting by size then we print its size, execpt for the + size or sorting by size then we print its size, except for the (weird) special case where both flags are defined, in which case we print both values. This conforms to documented behaviour. */ if (sort_by_size && !print_size) print_value (abfd, SYM_SIZE (info)); else print_value (abfd, SYM_VALUE (info)); - if (print_size && SYM_SIZE (info)) { printf (" "); @@ -1478,7 +1601,7 @@ print_symbol_info_sysv (struct extended_symbol_info *info, bfd *abfd) if (bfd_is_undefined_symclass (SYM_TYPE (info))) { - if (print_width == 8) + if (print_width == 32) printf (" "); else printf (" "); @@ -1500,7 +1623,10 @@ print_symbol_info_sysv (struct extended_symbol_info *info, bfd *abfd) /* Type, Size, Line, Section */ if (info->elfinfo) printf ("%18s|", - get_symbol_type (ELF_ST_TYPE (info->elfinfo->internal_elf_sym.st_info))); + get_elf_symbol_type (ELF_ST_TYPE (info->elfinfo->internal_elf_sym.st_info))); + else if (info->coffinfo) + printf ("%18s|", + get_coff_symbol_type (&info->coffinfo->native->u.syment)); else printf (" |"); @@ -1508,7 +1634,7 @@ print_symbol_info_sysv (struct extended_symbol_info *info, bfd *abfd) print_value (abfd, SYM_SIZE (info)); else { - if (print_width == 8) + if (print_width == 32) printf (" "); else printf (" "); @@ -1516,6 +1642,8 @@ print_symbol_info_sysv (struct extended_symbol_info *info, bfd *abfd) if (info->elfinfo) printf("| |%s", info->elfinfo->symbol.section->name); + else if (info->coffinfo) + printf("| |%s", info->coffinfo->symbol.section->name); else printf("| |"); } @@ -1538,65 +1666,188 @@ print_symbol_info_posix (struct extended_symbol_info *info, bfd *abfd) } } -static void -print_symdef_entry (bfd *abfd) +int +main (int argc, char **argv) { - symindex idx = BFD_NO_MORE_SYMBOLS; - carsym *thesym; - bfd_boolean everprinted = FALSE; + int c; + int retval; - for (idx = bfd_get_next_mapent (abfd, idx, &thesym); - idx != BFD_NO_MORE_SYMBOLS; - idx = bfd_get_next_mapent (abfd, idx, &thesym)) +#if defined (HAVE_SETLOCALE) && defined (HAVE_LC_MESSAGES) + setlocale (LC_MESSAGES, ""); +#endif +#if defined (HAVE_SETLOCALE) + setlocale (LC_CTYPE, ""); + setlocale (LC_COLLATE, ""); +#endif + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + + program_name = *argv; + xmalloc_set_program_name (program_name); + bfd_set_error_program_name (program_name); +#if BFD_SUPPORTS_PLUGINS + bfd_plugin_set_program_name (program_name); +#endif + + START_PROGRESS (program_name, 0); + + expandargv (&argc, &argv); + + 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:", + long_options, (int *) 0)) != EOF) { - bfd *elt; - if (!everprinted) - { - printf (_("\nArchive index:\n")); - everprinted = TRUE; - } - elt = bfd_get_elt_at_index (abfd, idx); - if (elt == NULL) - bfd_fatal ("bfd_get_elt_at_index"); - if (thesym->name != (char *) NULL) + switch (c) { - print_symname ("%s", thesym->name, abfd); - printf (" in %s\n", bfd_get_filename (elt)); + case 'a': + print_debug_syms = 1; + break; + case 'A': + case 'o': + filename_per_symbol = 1; + break; + case 'B': /* For MIPS compatibility. */ + set_output_format ("bsd"); + break; + case 'C': + do_demangle = 1; + if (optarg != NULL) + { + enum demangling_styles style; + + style = cplus_demangle_name_to_style (optarg); + if (style == unknown_demangling) + fatal (_("unknown demangling style `%s'"), + optarg); + + 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; + case 'e': + /* Ignored for HP/UX compatibility. */ + break; + case 'f': + set_output_format (optarg); + break; + case 'g': + external_only = 1; + break; + case 'H': + case 'h': + usage (stdout, 0); + case 'l': + line_numbers = 1; + break; + case 'n': + case 'v': + no_sort = 0; + sort_numerically = 1; + sort_by_size = 0; + break; + case 'p': + no_sort = 1; + sort_numerically = 0; + sort_by_size = 0; + break; + case OPTION_SIZE_SORT: + no_sort = 0; + sort_numerically = 0; + sort_by_size = 1; + break; + case 'P': + set_output_format ("posix"); + break; + case 'r': + reverse_sort = 1; + break; + case 's': + print_armap = 1; + break; + case 'S': + print_size = 1; + break; + case 't': + set_print_radix (optarg); + break; + case 'u': + undefined_only = 1; + break; + case 'V': + show_version = 1; + break; + case 'X': + /* Ignored for (partial) AIX compatibility. On AIX, the + argument has values 32, 64, or 32_64, and specifies that + only 32-bit, only 64-bit, or both kinds of objects should + be examined. The default is 32. So plain AIX nm on a + library archive with both kinds of objects will ignore + the 64-bit ones. For GNU nm, the default is and always + has been -X 32_64, and other options are not supported. */ + if (strcmp (optarg, "32_64") != 0) + fatal (_("Only -X 32_64 is supported")); + break; + + case OPTION_TARGET: /* --target */ + 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; + + default: + usage (stderr, 1); } } -} - -/* This function is used to get the relocs for a particular section. - It is called via bfd_map_over_sections. */ - -static void -get_relocs (bfd *abfd, asection *sec, void *dataarg) -{ - struct get_relocs_info *data = (struct get_relocs_info *) dataarg; - *data->secs = sec; + if (show_version) + print_version ("nm"); - if ((sec->flags & SEC_RELOC) == 0) + if (sort_by_size && undefined_only) { - *data->relocs = NULL; - *data->relcount = 0; + non_fatal (_("Using the --size-sort and --undefined-only options together")); + non_fatal (_("will produce no output, since undefined symbols have no size.")); + return 0; } - else - { - long relsize; - relsize = bfd_get_reloc_upper_bound (abfd, sec); - if (relsize < 0) - bfd_fatal (bfd_get_filename (abfd)); + /* OK, all options now parsed. If no filename specified, do a.out. */ + if (optind == argc) + return !display_file ("a.out"); - *data->relocs = (arelent **) xmalloc (relsize); - *data->relcount = bfd_canonicalize_reloc (abfd, sec, *data->relocs, - data->syms); - if (*data->relcount < 0) - bfd_fatal (bfd_get_filename (abfd)); + retval = 0; + + if (argc - optind > 1) + filename_per_file = 1; + + /* We were given several filenames to do. */ + while (optind < argc) + { + PROGRESS (1); + if (!display_file (argv[optind++])) + retval++; } - ++data->secs; - ++data->relocs; - ++data->relcount; + END_PROGRESS (program_name); + + exit (retval); + return retval; }