summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-06-15 21:27:30 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-06-15 21:27:30 -0700
commit1794876088b10142e49f27d712b724313f032a08 (patch)
tree0350f1f5f50a7729eaa96e69a7cac9d8eaf3802f
parentd11c48d9104ae7e5e979428ec01bc204bde38bfd (diff)
parent04e225ccefa76a562b4701a65902508082559856 (diff)
downloadnasm-1794876088b10142e49f27d712b724313f032a08.tar.gz
nasm-1794876088b10142e49f27d712b724313f032a08.tar.bz2
nasm-1794876088b10142e49f27d712b724313f032a08.zip
Merge branch 'nasm-2.03.x'
Conflicts: doc/nasmdoc.src
-rw-r--r--doc/nasmdoc.src9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/nasmdoc.src b/doc/nasmdoc.src
index 9c2070a..7a0c5a5 100644
--- a/doc/nasmdoc.src
+++ b/doc/nasmdoc.src
@@ -576,15 +576,14 @@ file has been removed.
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
+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.04 and later automatically enable \c{-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