* doc/as.texinfo: Refer to or include c-alpha.texi for Alpha

	options.  Refer to or include c-tic6x.texi for C6X options instead
	of duplicating documentation here.
	* doc/c-alpha.texi, doc/c-tic6x.texi: Add markup for use in
	manpage generation.

4 files changed, 52 insertions, 60 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ce29bfe..cbdd097 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* doc/as.texinfo: Refer to or include c-alpha.texi for Alpha
+	options.  Refer to or include c-tic6x.texi for C6X options instead
+	of duplicating documentation here.
+	* doc/c-alpha.texi, doc/c-tic6x.texi: Add markup for use in
+	manpage generation.
+
 2010-11-19  Alan Modra  <amodra@gmail.com>
 
     	PR 2606
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index 6a3fc81..45dcb30 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -702,7 +702,28 @@ Generate an object file even after errors.
 Standard input, or source files to assemble.
 
 @end table
+@c man end
+
+@ifset ALPHA
+
+@ifclear man
+@xref{Alpha Options}, for the options available when @value{AS} is configured
+for an Alpha processor.
+@end ifclear
+
+@ifset man
+@c man begin OPTIONS
+The following options are available when @value{AS} is configured for an Alpha
+processor.
+@c man end
+@c man begin INCLUDE
+@include c-alpha.texi
+@c ended inside the included file
+@end ifset
+
+@end ifset
 
+@c man begin OPTIONS
 @ifset ARC
 The following options are available when @value{AS} is configured for
 an ARC processor.
@@ -1261,71 +1282,28 @@ Warn whenever the operand for a base or index register has been specified
 but evaluates to zero.
 @end table
 @end ifset
+@c man end
 
 @ifset TIC6X
+
+@ifclear man
+@xref{TIC6X Options}, for the options available when @value{AS} is configured
+for a TMS320C6000 processor.
+@end ifclear
+
+@ifset man
+@c man begin OPTIONS
 The following options are available when @value{AS} is configured for a
 TMS320C6000 processor.
-
-@table @gcctabopt
-@item -march=@var{arch}
-Enable (only) instructions from architecture @var{arch}.  By default,
-all instructions are permitted.
-
-The following values of @var{arch} are accepted: @code{c62x},
-@code{c64x}, @code{c64x+}, @code{c67x}, @code{c67x+}, @code{c674x}.
-
-@item -matomic
-@itemx -mno-atomic
-Enable or disable the optional C64x+ atomic operation instructions.
-By default, they are enabled if no @option{-march} option is given, or
-if an architecture is specified with @option{-march} that implies
-these instructions are present (currently, there are no such
-architectures); they are disabled if an architecture is specified with
-@option{-march} on which the instructions are optional or not
-present.  This option overrides such a default from the architecture,
-independent of the order in which the @option{-march} or
-@option{-matomic} or @option{-mno-atomic} options are passed.
-
-@item -mdsbt
-@itemx -mno-dsbt
-The @option{-mdsbt} option causes the assembler to generate the
-@code{Tag_ABI_DSBT} attribute with a value of 1, indicating that the
-code is using DSBT addressing.  The @option{-mno-dsbt} option, the
-default, causes the tag to have a value of 0, indicating that the code
-does not use DSBT addressing.  The linker will emit a warning if
-objects of different type (DSBT and non-DSBT) are linked together.
-
-@item -mpid=no
-@itemx -mpid=near
-@itemx -mpid=far
-The @option{-mpid=} option causes the assembler to generate the
-@code{Tag_ABI_PID} attribute with a value indicating the form of data
-addressing used by the code.  @option{-mpid=no}, the default,
-indicates position-dependent data addressing, @option{-mpid=near}
-indicates position-independent addressing with GOT accesses using near
-DP addressing, and @option{-mpid=far} indicates position-independent
-addressing with GOT accesses using far DP addressing.  The linker will
-emit a warning if objects built with different settings of this option
-are linked together.
-
-@item -mpic
-@itemx -mno-pic
-The @option{-mpic} option causes the assembler to generate the
-@code{Tag_ABI_PIC} attribute with a value of 1, indicating that the
-code is using position-independent code addressing,  The
-@code{-mno-pic} option, the default, causes the tag to have a value of
-0, indicating position-dependent code addressing.  The linker will
-emit a warning if objects of different type (position-dependent and
-position-independent) are linked together.
-
-@item -mbig-endian
-@itemx -mlittle-endian
-Generate code for the specified endianness.  The default is
-little-endian.
-@end table
+@c man end
+@c man begin INCLUDE
+@include c-tic6x.texi
+@c ended inside the included file
+@end ifset
 
 @end ifset
 
+@c man begin OPTIONS
 @ifset XTENSA
 The following options are available when @value{AS} is configured for
 an Xtensa processor.
diff --git a/gas/doc/c-alpha.texi b/gas/doc/c-alpha.texi
index 3284f6f..e634304 100644
--- a/gas/doc/c-alpha.texi
+++ b/gas/doc/c-alpha.texi
@@ -2,6 +2,7 @@
 @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
@@ -38,7 +39,8 @@ features specific to these formats are not yet documented.
 @cindex Alpha options
 @cindex options for Alpha
 
-@table @option
+@c man begin OPTIONS
+@table @gcctabopt
 @cindex @code{-m@var{cpu}} command line option, Alpha
 @item -m@var{cpu}
 This option specifies the target processor.  If an attempt is made to
@@ -117,6 +119,7 @@ while smaller symbols are placed in @code{.sbss}.
 @itemx -32addr
 These options are ignored for backward compatibility.
 @end table
+@c man end
 
 @cindex Alpha Syntax
 @node Alpha Syntax
diff --git a/gas/doc/c-tic6x.texi b/gas/doc/c-tic6x.texi
index 72c873b..12d70ba 100644
--- a/gas/doc/c-tic6x.texi
+++ b/gas/doc/c-tic6x.texi
@@ -1,6 +1,7 @@
 @c Copyright 2010 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 TIC6X-Dependent
@@ -24,7 +25,8 @@
 @cindex TIC6X options
 @cindex options for TIC6X
 
-@table @code
+@c man begin OPTIONS
+@table @gcctabopt
 
 @cindex @code{-march=} command line option, TIC6X
 @item -march=@var{arch}
@@ -95,6 +97,7 @@ Generate code for the specified endianness.  The default is
 little-endian.
 
 @end table
+@c man end
 
 @node TIC6X Syntax
 @section TIC6X Syntax