diff options
| author | Nick Clifton <nickc@redhat.com> | 2003-03-04 16:23:46 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2003-03-04 16:23:46 +0000 |
| commit | ca22ba58ebe23c5307ee1209876de155ee392ecc (patch) | |
| tree | 5edfbf6dc6e52f242c02ee0c4a5c6ab085a8ffa5 | |
| parent | 65dfb858645a8cdd195c818e2250135ff212d10e (diff) | |
| download | binutils-redhat-ca22ba58ebe23c5307ee1209876de155ee392ecc.tar.gz | |
(print_symbol): Remove check for undefined_only.
(main): Print a warning message if --size-sort and --undefined-only are used
together.
| -rw-r--r-- | binutils/ChangeLog | 9 | ||||
| -rw-r--r-- | binutils/nm.c | 41 |
2 files changed, 29 insertions, 21 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index d63db67ffa..bdbdddb372 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,12 @@ +2003-03-04 Nick Clifton <nickc@redhat.com> + + * nm.c (main): Print a warning message if --size-sort and + --undefined-only are used together. + +2003-03-04 Elias Athanasopoulos <elathan@phys.uoa.gr> + + * nm.c (print_symbol): Remove check for undefined_only. + 2003-03-03 Nick Clifton <nickc@redhat.com> * po/da.po: Installed latest translation. diff --git a/binutils/nm.c b/binutils/nm.c index 5d88ae6b36..4f558c1f26 100644 --- a/binutils/nm.c +++ b/binutils/nm.c @@ -509,6 +509,13 @@ main (argc, argv) if (show_version) print_version ("nm"); + if (sort_by_size && undefined_only) + { + 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; + } + /* OK, all options now parsed. If no filename specified, do a.out. */ if (optind == argc) return !display_file ("a.out"); @@ -1214,29 +1221,21 @@ print_symbol (abfd, sym, ssize, archive_bfd) bfd_vma ssize; bfd *archive_bfd; { + symbol_info syminfo; + struct extended_symbol_info info; + PROGRESS (1); (*format->print_symbol_filename) (archive_bfd, abfd); - if (undefined_only) - { - if (bfd_is_und_section (bfd_get_section (sym))) - print_symname ("%s", bfd_asymbol_name (sym), 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 - { - symbol_info syminfo; - struct extended_symbol_info info; - - 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); - } + info.elfinfo = NULL; + (*format->print_symbol_info) (&info, abfd); if (line_numbers) { @@ -1585,9 +1584,9 @@ print_symbol_info_sysv (info, abfd) if (SYM_TYPE (info) == '-') { /* A stab. */ - printf ("%18s| ", SYM_STAB_NAME (info)); /* (C) Type */ - printf (desc_format, SYM_STAB_DESC (info)); /* Size */ - printf ("| |"); /* Line, Section */ + printf ("%18s| ", SYM_STAB_NAME (info)); /* (C) Type. */ + printf (desc_format, SYM_STAB_DESC (info)); /* Size. */ + printf ("| |"); /* Line, Section. */ } else { |