Refer to and include c-i386.texi for i386 options.

2010-11-23  H.J. Lu  <hongjiu.lu@intel.com>

	* doc/as.texinfo: Refer to and include c-i386.texi for i386
	options.

	* doc/c-i386.texi: Add markup for use in manpage generation.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index cbdd0972ebc7cd9e91f0385a89f7e42c48cffe0b..7b00c40a2cac094d719a2f388742b01d45f08a23 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-23  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * doc/as.texinfo: Refer to and include c-i386.texi for i386 
+       options.
+
+       * doc/c-i386.texi: Add markup for use in manpage generation.
+
 2010-11-22  Joseph Myers  <joseph@codesourcery.com>
 
        * doc/as.texinfo: Refer to or include c-alpha.texi for Alpha

diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index 45dcb30ae0a2ff7be3a094fd392a82909c7264bd..bddd93cfa2f0f1b9e1c270484092bf26e72127a5 100644 (file)
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -811,8 +811,29 @@ Warn when nops are generated.
 @item -N
 Warn when a nop after a 32-bit multiply instruction is generated.
 @end table
+@end ifset
+@c man end
+
+@ifset I80386
+
+@ifclear man
+@xref{i386-Options}, for the options available when @value{AS} is
+configured for an i386 processor.
+@end ifclear
+
+@ifset man
+@c man begin OPTIONS
+The following options are available when @value{AS} is configured for
+an i386 processor.
+@c man end
+@c man begin INCLUDE
+@include c-i386.texi
+@c ended inside the included file
+@end ifset
+
 @end ifset
 
+@c man begin OPTIONS
 @ifset I960
 The following options are available when @value{AS} is configured for the
 Intel 80960 processor.

diff --git a/gas/doc/c-i386.texi b/gas/doc/c-i386.texi
index d0a47debd436a70f3e563f98802d7b0efc6afa25..1c6175b9cfc02e2c100cd2b600111b4831d8c988 100644 (file)
--- a/gas/doc/c-i386.texi
+++ b/gas/doc/c-i386.texi
@@ -3,6 +3,8 @@
 @c Free Software Foundation, Inc.
 @c This is part of the GAS manual.
 @c For copying conditions, see the file as.texinfo.
+@c man end
+
 @ifset GENERIC
 @page
 @node i386-Dependent
@@ -50,7 +52,8 @@ extending the Intel architecture to 64-bits.
 The i386 version of @code{@value{AS}} has a few machine
 dependent options:
 
-@table @code
+@c man begin OPTIONS
+@table @gcctabopt
 @cindex @samp{--32} option, i386
 @cindex @samp{--32} option, x86-64
 @cindex @samp{--64} option, i386
@@ -226,6 +229,7 @@ This opetion specifies that registers don't require a @samp{%} prefix.
 The @code{.att_syntax} and @code{.intel_syntax} directives will take precedent.
 
 @end table
+@c man end
 
 @node i386-Directives
 @section x86 specific Directives