Make -F imply -g (BR 1991213)

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

2 files changed, 12 insertions, 9 deletions

diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src
index d8717cb..e6ffde4 100644
--- a/doc/nasmdoc.src
+++ b/doc/nasmdoc.src
@@ -572,15 +572,17 @@ 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.
-
-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}. (As of 2.00,
-only "-f elf32", "-f elf64", "-f ieee", and "-f obj" provide debug information.) 
-See \k{opt-y}.
+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.04, 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.04 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}. (As of 2.00, only "-f elf32", "-f elf64", "-f ieee", and "-f obj"
+provide debug information.)  See \k{opt-y}.
 
 This should not be confused with the "-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 416cee8..52009d3 100644
--- a/nasm.c
+++ b/nasm.c
@@ -722,6 +722,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 */