* doc/binutils.texi (objdump): Document support for disassembling the 440 PowerPC...

[deliverable/binutils-gdb.git] / binutils / nm.c

diff --git a/binutils/nm.c b/binutils/nm.c
index 511e6d34755236bf3a43ddf94ccac966fb96978c..c1fb4d803e845e1f3de510f813dd99b393d31130 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -254,6 +254,7 @@ usage (FILE *stream, int status)
       --target=BFDNAME   Specify the target object format as BFDNAME\n\
   -u, --undefined-only   Display only undefined symbols\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"));
@@ -905,9 +906,10 @@ 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)
+         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);
@@ -1490,6 +1492,8 @@ main (int argc, char **argv)
 
   START_PROGRESS (program_name, 0);
 
+  expandargv (&argc, &argv);
+
   bfd_init ();
   set_default_bfd_target ();