From: H. Peter Anvin <hpa@zytor.com>
Date: Mon, 16 Jun 2008 04:25:56 +0000 (-0700)
Subject: Make -F imply -g (BR 1991213)
X-Git-Tag: nasm-2.11.05~1396^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=04e225ccefa76a562b4701a65902508082559856;p=platform%2Fupstream%2Fnasm.git

Make -F imply -g (BR 1991213)

When the user specifies -F, imply the -g option.  Too many users seem
to make this mistake.

Conflicts:

	doc/nasmdoc.src
---

diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src
index 908ae9f..45c1b0e 100644
--- a/doc/nasmdoc.src
+++ b/doc/nasmdoc.src
@@ -572,15 +572,16 @@ file has been removed.
 
 \S{opt-F} The \i\c{-F} Option: Selecting a \i{Debug Information Format}
 
-This option is used to select the format of the debug information emitted 
-into the output file, to be used by a debugger (or \e{will} be). Use
-of this switch does \e{not} enable output of the selected debug info format.
-Use \c{-g}, see \k{opt-g}, to enable output.
+This option is used to select the format of the debug information
+emitted into the output file, to be used by a debugger (or \e{will}
+be). Prior to version 2.03.01, the use of this switch did \e{not} enable
+output of the selected debug info format.  Use \c{-g}, see \k{opt-g},
+to enable output.  Versions 2.03.01 and later automatically enable \c{-g}
+if \c{-F} is specified.
 
 A complete list of the available debug file formats for an output
-format can be seen by issuing the command \i\c{nasm -f <format>
--y}. Not all output formats currently support debugging output.
-See \k{opt-y}.
+format can be seen by issuing the command \c{nasm -f <format> -y}.  Not
+all output formats currently support debugging output.  See \k{opt-y}.
 
 This should not be confused with the \c{-f dbg} output format option which 
 is not built into NASM by default. For information on how
diff --git a/nasm.c b/nasm.c
index 1eb5e4f..188a204 100644
--- a/nasm.c
+++ b/nasm.c
@@ -718,6 +718,7 @@ static bool process_arg(char *p, char *q)
 			     " output format `%s'",
 			     param, ofmt->shortname);
 	    }
+	    using_debug_info = true;
 	    break;
 
 	case 'X':		/* specify error reporting format */