3 files changed, 25 insertions, 11 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index bdfaf1f..14d31de 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-24  Mike Frysinger  <vapier@gentoo.org>
+
+	* doc/as.texinfo: Refer to and include c-bfin.texi for Blackfin
+	options.
+	* doc/c-bfin.texi: Add markup for use in manpage generation.
+
 2010-11-23  Sterling Augustine  <sterling@tensilica.com>
 
 	* doc/as.texinfo: Refer to and include c-xtensa.texi for Xtensa
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index a981814..8051124 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -766,19 +766,22 @@ Specify that PIC code has been generated.
 @end ifset
 
 @ifset Blackfin
+
+@ifclear man
+@xref{Blackfin Options}, for the options available when @value{AS} is
+configured for the Blackfin processor family.
+@end ifclear
+
+@ifset man
+@c man begin OPTIONS
 The following options are available when @value{AS} is configured for
 the Blackfin processor family.
+@c man end
+@c man begin INCLUDE
+@include c-bfin.texi
+@c ended inside the included file
+@end ifset
 
-@table @gcctabopt
-@item -mcpu=@var{processor}@r{[}-@var{sirevision}@r{]}
-This option specifies the target processor.  The optional @var{sirevision}
-is not used in assembler.
-@item -mfdpic
-Assemble for the FDPIC ABI.
-@item -mno-fdpic
-@itemx -mnopic
-Disable -mfdpic.
-@end table
 @end ifset
 
 @ifset CRIS
diff --git a/gas/doc/c-bfin.texi b/gas/doc/c-bfin.texi
index 7a36745..73e2a07 100644
--- a/gas/doc/c-bfin.texi
+++ b/gas/doc/c-bfin.texi
@@ -2,11 +2,14 @@
 @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 Blackfin-Dependent
 @chapter Blackfin Dependent Features
 @end ifset
+
 @ifclear GENERIC
 @node Machine Dependencies
 @chapter Blackfin Dependent Features
@@ -24,7 +27,8 @@
 @cindex Blackfin options (none)
 @cindex options for Blackfin (none)
 
-@table @code
+@c man begin OPTIONS
+@table @gcctabopt
 
 @cindex @code{-mcpu=} command line option, Blackfin
 @item -mcpu=@var{processor}@r{[}-@var{sirevision}@r{]}
@@ -79,6 +83,7 @@ Assemble for the FDPIC ABI.
 @itemx -mnopic
 Disable -mfdpic.
 @end table
+@c man end
 
 @node Blackfin Syntax
 @section Syntax