* nm.c (struct get_relocs_info): Define.

	(line_numbers): New static variable.
	(long_options): Add "line-numbers".
	(usage): Mention -l and --line-numbers.
	(main): Handle -l.
	(print_symbol): Print line numbers if requested.
	(get_relocs): New static function.
	* binutils.texi, nm.1: Document -l/--line-numbers.

2 files changed, 21 insertions, 1 deletions

diff --git a/binutils/binutils.texi b/binutils/binutils.texi
index aff80f8..2632279 100644
--- a/binutils/binutils.texi
+++ b/binutils/binutils.texi
@@ -580,7 +580,7 @@ nm [ -a | --debug-syms ]  [ -g | --extern-only ]
    [ -r | --reverse-sort ]  [ --size-sort ] [ -u | --undefined-only ]
    [ -t @var{radix} | --radix=@var{radix} ] [ -P | --portability ]
    [ --target=@var{bfdname} ] [ -f @var{format} | --format=@var{format} ]
-   [ --defined-only ]
+   [ --defined-only ] [-l | --line-numbers ]
    [ --no-demangle ] [ -V | --version ]  [ --help ]  [ @var{objfile}@dots{} ]
 @end smallexample
 
@@ -722,6 +722,15 @@ either upper or lower case.
 @cindex external symbols
 Display only external symbols.
 
+@item -l
+@itemx --line-numbers
+@cindex symbol line numbers
+For each symbol, use debugging information to try to find a filename and
+line number.  For a defined symbol, look for the line number of the
+address of the symbol.  For an undefined symbol, look for the line
+number of a relocation entry which refers to the symbol.  If line number
+information can be found, print it after the other symbol information.
+
 @item -n
 @itemx -v
 @itemx --numeric-sort 
diff --git a/binutils/nm.1 b/binutils/nm.1
index 13681be..c2ad99e 100644
--- a/binutils/nm.1
+++ b/binutils/nm.1
@@ -27,6 +27,7 @@ nm \- list symbols from object files.
 .RB "[\|" \-r | \-\-reverse\-sort "\|]" 
 .RB "[\|" \-\-size\-sort "\|]" 
 .RB "[\|" \-u | \-\-undefined\-only "\|]"  
+.RB "[\|" \-l | \-\-line\-numbers "\|]"
 .RB "[\|" \-\-help "\|]"  
 .RB "[\|" \-\-version "\|]"  
 .RB "[\|" "\-t \fIradix" | \-\-radix=\fIradix "\|]"
@@ -173,6 +174,16 @@ for information on listing available formats.
 Display only undefined symbols (those external to each object file).
 
 .TP
+.B \-l
+.TP
+.B \-\-line\-numbers
+For each symbol, use debugging information to try to find a filename and
+line number.  For a defined symbol, look for the line number of the
+address of the symbol.  For an undefined symbol, look for the line
+number of a relocation entry which refers to the symbol.  If line number
+information can be found, print it after the other symbol information.
+
+.TP
 .B \-V
 .TP
 .B \-\-version