* config/tc-ppc.c (md_show_usage): Remove -l and -b. Add -K PIC.

	* doc/as.texinfo: Refer to and include c-ppc.texi for PowerPC options.
	(Overview <Target PowerPC options>): Add a number of missing options.
	* doc/c-ppc.texi: Likewise.  Add markup for use in manpage generation.

4 files changed, 70 insertions, 14 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 6723cd9..84d0518 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-10  Alan Modra  <amodra@gmail.com>
+
+	* config/tc-ppc.c (md_show_usage): Remove -l and -b.  Add -K PIC.
+	* doc/as.texinfo: Refer to and include c-ppc.texi for PowerPC options.
+	(Overview <Target PowerPC options>): Add a number of missing options.
+	* doc/c-ppc.texi: Likewise.  Add markup for use in manpage generation.
+
 2011-02-08  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/6957
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 469abc1..4396e14 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -1244,12 +1244,13 @@ PowerPC options:\n\
 -mrelocatable           support for GCC's -mrelocatble option\n\
 -mrelocatable-lib       support for GCC's -mrelocatble-lib option\n\
 -memb                   set PPC_EMB bit in ELF flags\n\
--mlittle, -mlittle-endian, -l, -le\n\
+-mlittle, -mlittle-endian, -le\n\
                         generate code for a little endian machine\n\
--mbig, -mbig-endian, -b, -be\n\
+-mbig, -mbig-endian, -be\n\
                         generate code for a big endian machine\n\
 -msolaris               generate code for Solaris\n\
 -mno-solaris            do not generate code for Solaris\n\
+-K PIC                  set EF_PPC_RELOCATABLE_LIB in ELF flags\n\
 -V                      print assembler version number\n\
 -Qy, -Qn                ignored\n"));
 #endif
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index 6f09de8..5c575c5 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -428,13 +428,18 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
 @ifset PPC
 
 @emph{Target PowerPC options:}
-   [@b{-mpwrx}|@b{-mpwr2}|@b{-mpwr}|@b{-m601}|@b{-mppc}|@b{-mppc32}|@b{-m603}|@b{-m604}|
-    @b{-m403}|@b{-m405}|@b{-mppc64}|@b{-m620}|@b{-mppc64bridge}|@b{-mbooke}]
-   [@b{-mcom}|@b{-many}|@b{-maltivec}|@b{-mvsx}] [@b{-memb}]
+   [@b{-a32}|@b{-a64}]
+   [@b{-mpwrx}|@b{-mpwr2}|@b{-mpwr}|@b{-m601}|@b{-mppc}|@b{-mppc32}|@b{-m603}|@b{-m604}|@b{-m403}|@b{-m405}|
+    @b{-m440}|@b{-m464}|@b{-m476}|@b{-m7400}|@b{-m7410}|@b{-m7450}|@b{-m7455}|@b{-m750cl}|@b{-mppc64}|
+    @b{-m620}|@b{-me500}|@b{-e500x2}|@b{-me500mc}|@b{-me500mc64}|@b{-mppc64bridge}|@b{-mbooke}|
+    @b{-mpower4}|@b{-mpr4}|@b{-mpower5}|@b{-mpwr5}|@b{-mpwr5x}|@b{-mpower6}|@b{-mpwr6}|
+    @b{-mpower7}|@b{-mpw7}|@b{-ma2}|@b{-mcell}|@b{-mspe}|@b{-mtitan}|@b{-me300}|@b{-mcom}]
+   [@b{-many}] [@b{-maltivec}|@b{-mvsx}]
    [@b{-mregnames}|@b{-mno-regnames}]
-   [@b{-mrelocatable}|@b{-mrelocatable-lib}]
-   [@b{-mlittle}|@b{-mlittle-endian}|@b{-mbig}|@b{-mbig-endian}]
+   [@b{-mrelocatable}|@b{-mrelocatable-lib}|@b{-K PIC}] [@b{-memb}]
+   [@b{-mlittle}|@b{-mlittle-endian}|@b{-le}|@b{-mbig}|@b{-mbig-endian}|@b{-be}]
    [@b{-msolaris}|@b{-mno-solaris}]
+   [@b{-nops=@var{count}}]
 @end ifset
 @ifset RX
 
@@ -1283,6 +1288,25 @@ Assemble for a little endian target.
 See the info pages for documentation of the MMIX-specific options.
 @end ifset
 
+@ifset PPC
+
+@ifclear man
+@xref{PowerPC-Opts}, for the options available when @value{AS} is configured
+for a PowerPC processor.
+@end ifclear
+
+@ifset man
+@c man begin OPTIONS
+The following options are available when @value{AS} is configured for a
+PowerPC processor.
+@c man end
+@c man begin INCLUDE
+@include c-ppc.texi
+@c ended inside the included file
+@end ifset
+
+@end ifset
+
 @ifset RX
 See the info pages for documentation of the RX-specific options.
 @end ifset
diff --git a/gas/doc/c-ppc.texi b/gas/doc/c-ppc.texi
index f0bcbd5..d5572b5 100644
--- a/gas/doc/c-ppc.texi
+++ b/gas/doc/c-ppc.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
 @node PPC-Dependent
@@ -34,7 +35,17 @@ reference manual.
 
 The following table lists all available PowerPC options.
 
-@table @code
+@c man begin OPTIONS
+@table @gcctabopt
+@item -a32
+Generate ELF32 or XCOFF32.
+
+@item -a64
+Generate ELF64 or XCOFF64.
+
+@item -K PIC
+Set EF_PPC_RELOCATABLE_LIB in ELF flags.
+
 @item -mpwrx | -mpwr2
 Generate code for POWER/2 (RIOS2).
 
@@ -53,6 +64,9 @@ Generate code for PowerPC 403/405.
 @item -m440
 Generate code for PowerPC 440.  BookE and some 405 instructions.
 
+@item -m464
+Generate code for PowerPC 464.
+
 @item -m476
 Generate code for PowerPC 476.
 
@@ -68,6 +82,12 @@ Generate code for PowerPC 620/625/630.
 @item -me500, -me500x2
 Generate code for Motorola e500 core complex.
 
+@item -me500mc
+Generate code for Freescale e500mc core complex.
+
+@item -me500mc64
+Generate code for Freescale e500mc64 core complex.
+
 @item -mspe
 Generate code for Motorola SPE instructions.
 
@@ -92,16 +112,16 @@ Generate code for processors with AltiVec instructions.
 @item -mvsx
 Generate code for processors with Vector-Scalar (VSX) instructions.
 
-@item -mpower4
+@item -mpower4, -mpwr4
 Generate code for Power4 architecture.
 
-@item -mpower5
+@item -mpower5, -mpwr5, -mpwr5x
 Generate code for Power5 architecture.
 
-@item -mpower6
+@item -mpower6, -mpwr6
 Generate code for Power6 architecture.
 
-@item -mpower7
+@item -mpower7, -mpwr7
 Generate code for Power7 architecture.
 
 @item -mcell
@@ -128,10 +148,10 @@ Support for GCC's -mrelocatable-lib option.
 @item -memb
 Set PPC_EMB bit in ELF flags.
 
-@item -mlittle, -mlittle-endian
+@item -mlittle, -mlittle-endian, -le
 Generate code for a little endian machine.
 
-@item -mbig, -mbig-endian
+@item -mbig, -mbig-endian, -be
 Generate code for a big endian machine.
 
 @item -msolaris
@@ -139,7 +159,11 @@ Generate code for Solaris.
 
 @item -mno-solaris
 Do not generate code for Solaris.
+
+@item -nops=@var{count}
+When aligning, more than @var{count} nops uses a branch.
 @end table
+@c man end
 
 
 @node PowerPC-Pseudo