#include "bfd.h"
#include "progress.h"
#include "bucomm.h"
+#include "budemang.h"
#include "getopt.h"
#include "aout/stab_gnu.h"
#include "aout/ranlib.h"
asymbol **syms;
};
-struct extended_symbol_info
+struct extended_symbol_info
{
symbol_info *sinfo;
bfd_vma ssize;
#define SYM_SIZE(sym) \
(sym->elfinfo ? sym->elfinfo->internal_elf_sym.st_size: sym->ssize)
-static void usage PARAMS ((FILE *, int));
-static void set_print_radix PARAMS ((char *));
-static void set_output_format PARAMS ((char *));
-static void display_archive PARAMS ((bfd *));
-static boolean display_file PARAMS ((char *));
-static void display_rel_file PARAMS ((bfd *, bfd *));
-static long filter_symbols PARAMS ((bfd *, boolean, PTR, long, unsigned int));
-static long sort_symbols_by_size PARAMS ((bfd *, boolean, PTR, long, unsigned int, struct size_sym **));
-static void print_symbols PARAMS ((bfd *, boolean, PTR, long, unsigned int, bfd *));
-static void print_size_symbols PARAMS ((bfd *, boolean, struct size_sym *, long, bfd *));
-static void print_symname PARAMS ((const char *, const char *, bfd *));
-static void print_symbol PARAMS ((bfd *, asymbol *, bfd_vma ssize, bfd *));
-static void print_symdef_entry PARAMS ((bfd *));
+static void usage
+ PARAMS ((FILE *, int));
+static void set_print_radix
+ PARAMS ((char *));
+static void set_output_format
+ PARAMS ((char *));
+static void display_archive
+ PARAMS ((bfd *));
+static bfd_boolean display_file
+ PARAMS ((char *));
+static void display_rel_file
+ PARAMS ((bfd *, bfd *));
+static long filter_symbols
+ PARAMS ((bfd *, bfd_boolean, PTR, long, unsigned int));
+static long sort_symbols_by_size
+ PARAMS ((bfd *, bfd_boolean, PTR, long, unsigned int, struct size_sym **));
+static void print_symbols
+ PARAMS ((bfd *, bfd_boolean, PTR, long, unsigned int, bfd *));
+static void print_size_symbols
+ PARAMS ((bfd *, bfd_boolean, struct size_sym *, long, bfd *));
+static void print_symname
+ PARAMS ((const char *, const char *, bfd *));
+static void print_symbol
+ PARAMS ((bfd *, asymbol *, bfd_vma ssize, bfd *));
+static void print_symdef_entry
+ PARAMS ((bfd *));
/* The sorting functions. */
-static int numeric_forward PARAMS ((const PTR, const PTR));
-static int numeric_reverse PARAMS ((const PTR, const PTR));
-static int non_numeric_forward PARAMS ((const PTR, const PTR));
-static int non_numeric_reverse PARAMS ((const PTR, const PTR));
-static int size_forward1 PARAMS ((const PTR, const PTR));
-static int size_forward2 PARAMS ((const PTR, const PTR));
+static int numeric_forward
+ PARAMS ((const PTR, const PTR));
+static int numeric_reverse
+ PARAMS ((const PTR, const PTR));
+static int non_numeric_forward
+ PARAMS ((const PTR, const PTR));
+static int non_numeric_reverse
+ PARAMS ((const PTR, const PTR));
+static int size_forward1
+ PARAMS ((const PTR, const PTR));
+static int size_forward2
+ PARAMS ((const PTR, const PTR));
/* The output formatting functions. */
-static void print_object_filename_bsd PARAMS ((char *));
-static void print_object_filename_sysv PARAMS ((char *));
-static void print_object_filename_posix PARAMS ((char *));
-static void print_archive_filename_bsd PARAMS ((char *));
-static void print_archive_filename_sysv PARAMS ((char *));
-static void print_archive_filename_posix PARAMS ((char *));
-static void print_archive_member_bsd PARAMS ((char *, const char *));
-static void print_archive_member_sysv PARAMS ((char *, const char *));
-static void print_archive_member_posix PARAMS ((char *, const char *));
-static void print_symbol_filename_bsd PARAMS ((bfd *, bfd *));
-static void print_symbol_filename_sysv PARAMS ((bfd *, bfd *));
-static void print_symbol_filename_posix PARAMS ((bfd *, bfd *));
-static void print_value PARAMS ((bfd *, bfd_vma));
-static void print_symbol_info_bsd PARAMS ((struct extended_symbol_info *, bfd *));
-static void print_symbol_info_sysv PARAMS ((struct extended_symbol_info *, bfd *));
-static void print_symbol_info_posix PARAMS ((struct extended_symbol_info *, bfd *));
-static void get_relocs PARAMS ((bfd *, asection *, PTR));
-static const char * get_symbol_type PARAMS ((unsigned int));
+static void print_object_filename_bsd
+ PARAMS ((char *));
+static void print_object_filename_sysv
+ PARAMS ((char *));
+static void print_object_filename_posix
+ PARAMS ((char *));
+static void print_archive_filename_bsd
+ PARAMS ((char *));
+static void print_archive_filename_sysv
+ PARAMS ((char *));
+static void print_archive_filename_posix
+ PARAMS ((char *));
+static void print_archive_member_bsd
+ PARAMS ((char *, const char *));
+static void print_archive_member_sysv
+ PARAMS ((char *, const char *));
+static void print_archive_member_posix
+ PARAMS ((char *, const char *));
+static void print_symbol_filename_bsd
+ PARAMS ((bfd *, bfd *));
+static void print_symbol_filename_sysv
+ PARAMS ((bfd *, bfd *));
+static void print_symbol_filename_posix
+ PARAMS ((bfd *, bfd *));
+static void print_value
+ PARAMS ((bfd *, bfd_vma));
+static void print_symbol_info_bsd
+ PARAMS ((struct extended_symbol_info *, bfd *));
+static void print_symbol_info_sysv
+ PARAMS ((struct extended_symbol_info *, bfd *));
+static void print_symbol_info_posix
+ PARAMS ((struct extended_symbol_info *, bfd *));
+static void get_relocs
+ PARAMS ((bfd *, asection *, PTR));
+static const char * get_symbol_type
+ PARAMS ((unsigned int));
/* Support for different output formats. */
struct output_fns
-B Same as --format=bsd\n\
-C, --demangle[=STYLE] Decode low-level symbol names into user-level names\n\
The STYLE, if specified, can be `auto' (the default),\n\
- `gnu', 'lucid', 'arm', 'hp', 'edg' or 'gnu-new-abi'\n\
+ `gnu', 'lucid', 'arm', 'hp', 'edg' or 'gnu-v3'\n\
--no-demangle Do not demangle low-level symbol names\n\
-D, --dynamic Display dynamic symbols instead of normal symbols\n\
--defined-only Display only defined symbols\n\
#endif
#if defined (HAVE_SETLOCALE)
setlocale (LC_CTYPE, "");
+ setlocale (LC_COLLATE, "");
#endif
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
}
}
-static boolean
+static bfd_boolean
display_file (filename)
char *filename;
{
- boolean retval = true;
+ bfd_boolean retval = TRUE;
bfd *file;
char **matching;
if (file == NULL)
{
bfd_nonfatal (filename);
- return false;
+ return FALSE;
}
if (bfd_check_format (file, bfd_archive))
list_matching_formats (matching);
free (matching);
}
- retval = false;
+ retval = FALSE;
}
- if (bfd_close (file) == false)
+ if (!bfd_close (file))
bfd_fatal (filename);
lineno_cache_bfd = NULL;
/* These globals are used to pass information into the sorting
routines. */
static bfd *sort_bfd;
-static boolean sort_dynamic;
+static bfd_boolean sort_dynamic;
static asymbol *sort_x;
static asymbol *sort_y;
xn = bfd_asymbol_name (x);
yn = bfd_asymbol_name (y);
- return ((xn == NULL) ? ((yn == NULL) ? 0 : -1) :
- ((yn == NULL) ? 1 : strcmp (xn, yn)));
+ if (yn == NULL)
+ return xn != NULL;
+ if (xn == NULL)
+ return -1;
+
+#ifdef HAVE_STRCOLL
+ /* Solaris 2.5 has a bug in strcoll.
+ strcoll returns invalid values when confronted with empty strings. */
+ if (*yn == '\0')
+ return *xn != '\0';
+ if (*xn == '\0')
+ return -1;
+
+ return strcoll (xn, yn);
+#else
+ return strcmp (xn, yn);
+#endif
}
static int
static long
sort_symbols_by_size (abfd, dynamic, minisyms, symcount, size, symsizesp)
bfd *abfd;
- boolean dynamic;
+ bfd_boolean dynamic;
PTR minisyms;
long symcount;
unsigned int size;
sec = bfd_get_section (sym);
- if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+ if (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))
sz = sym->value;
static long
filter_symbols (abfd, dynamic, minisyms, symcount, size)
bfd *abfd;
- boolean dynamic;
+ bfd_boolean dynamic;
PTR minisyms;
long symcount;
unsigned int size;
{
if (do_demangle && *name)
{
- char *res;
+ char *res = demangle (abfd, name);
- /* In this mode, give a user-level view of the symbol name
- even if it's not mangled; strip off any leading
- underscore. */
- if (bfd_get_symbol_leading_char (abfd) == name[0])
- name++;
-
- res = cplus_demangle (name, DMGL_ANSI | DMGL_PARAMS);
- if (res)
- {
- printf (format, res);
- free (res);
- return;
- }
+ printf (format, res);
+ free (res);
+ return;
}
printf (format, name);
static void
print_symbols (abfd, dynamic, minisyms, symcount, size, archive_bfd)
bfd *abfd;
- boolean dynamic;
+ bfd_boolean dynamic;
PTR minisyms;
long symcount;
unsigned int size;
static void
print_size_symbols (abfd, dynamic, symsizes, symcount, archive_bfd)
bfd *abfd;
- boolean dynamic;
+ bfd_boolean dynamic;
struct size_sym *symsizes;
long symcount;
bfd *archive_bfd;
bfd_get_symbol_info (abfd, sym, &syminfo);
info.sinfo = &syminfo;
info.ssize = ssize;
- if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
+ if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
info.elfinfo = (elf_symbol_type *) sym;
else
info.elfinfo = NULL;
printf ("| |"); /* Line, Section */
}
else
- {
+ {
/* Type, Size, Line, Section */
if (info->elfinfo)
printf ("%18s|",
{
symindex idx = BFD_NO_MORE_SYMBOLS;
carsym *thesym;
- boolean everprinted = false;
+ bfd_boolean everprinted = FALSE;
for (idx = bfd_get_next_mapent (abfd, idx, &thesym);
idx != BFD_NO_MORE_SYMBOLS;
if (!everprinted)
{
printf (_("\nArchive index:\n"));
- everprinted = true;
+ everprinted = TRUE;
}
elt = bfd_get_elt_at_index (abfd, idx);
if (elt == NULL)
projects / deliverable / binutils-gdb.git / blobdiff