* objdump.c (with_source_code): New global variable.

	(usage): Mention -S/--source.
	(long_options): Add --source.
	(prev_functionname, prev_line): New static variables.
	(struct print_file_list): Define.
	(print_files): New static variable.
	(skip_to_line, show_line): New static functions.
	(disassemble_data): Call show_line to handle -l and -S.
	(main): Handle -S.
	* binutils.texi, objdump.1: Document -S/--source.

diff --git a/binutils/binutils.texi b/binutils/binutils.texi
index 4d50e7274fd1abefc025985a2a425c7451ab4691..5c977bdc222c9d0ac4d5df5a974728aabcaffdac 100644 (file)
--- a/binutils/binutils.texi
+++ b/binutils/binutils.texi
@@ -929,7 +929,7 @@ objdump [ -a | --archive-headers ]
         [ -f | --file-headers ]
         [ -h | --section-headers | --headers ]  [ -i | --info ]
         [ -j @var{section} | --section=@var{section} ]
-        [ -l | --line-numbers ]
+        [ -l | --line-numbers ] [ -S | --source ]
         [ -m @var{machine} | --architecture=@var{machine} ]
         [ -r | --reloc ] [ -R | --dynamic-reloc ]
         [ -s | --full-contents ]  [ --stabs ]
@@ -1061,6 +1061,13 @@ libraries.
 @cindex object file sections
 Display the full contents of any sections requested.
 
+@item -S
+@itemx --source
+@cindex source disassembly
+@cindex disassembly, with source
+Display source code intermixed with disassembly, if possible.  Implies
+@samp{-d}.
+
 @item --stabs
 @cindex stab
 @cindex .stab

diff --git a/binutils/objdump.1 b/binutils/objdump.1
index 4a9da615e916061a60f88cf6330eae734026060e..f5beb3302d4f0e1a21136054026ab7bfc75619cf 100644 (file)
--- a/binutils/objdump.1
+++ b/binutils/objdump.1
@@ -41,6 +41,7 @@ objdump \- display information from object files.
 .RB "[\|" \-r | \-\-reloc "\|]" 
 .RB "[\|" \-R | \-\-dynamic\-reloc "\|]" 
 .RB "[\|" \-s | \-\-full\-contents "\|]"
+.RB "[\|" \-S | \-\-source "\|]"
 .RB "[\|" \-\-stabs "\|]"
 .RB "[\|" \-t | \-\-syms "\|]" 
 .RB "[\|" \-T | \-\-dynamic\-syms "\|]" 
@@ -227,6 +228,13 @@ libraries.
 .B \-\-full\-contents
 Display the full contents of any sections requested.
 
+.TP
+.B \-S
+.TP
+.B \-\-source
+Display source code intermixed with disassembly, if possible.  Implies
+\fB-d\fP.
+
 .TP
 .B \-\-stabs
 Display the contents of the .stab, .stab.index, and .stab.excl