gas/

	* config/tc-ppc.c (md_show_usage): Rename "ppca2" to "a2".
	* doc/c-ppc.texi (PowerPC-Opts): Likewise.

gas/testsuite/
	* gas/ppc/a2.d: Rename "ppca2" to "a2".

include/opcode/
	* ppc.h (PPC_OPCODE_A2): Rename from PPC_OPCODE_PPCA2.

opcodes/
	* ppc-opc.c (PPCA2): Use renamed mask PPC_OPCODE_A2.
	* ppc-dis.c (ppc_opts): Likewise.
	Rename "ppca2" to "a2".

10 files changed, 28 insertions, 9 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3ce13f7..be46061 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-01  Peter Bergner  <bergner@vnet.ibm.com>
+
+	* config/tc-ppc.c (md_show_usage): Rename "ppca2" to "a2".
+	* doc/c-ppc.texi (PowerPC-Opts): Likewise.
+
 2009-10-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/tc-i386.c (x86_cons): Reformat.
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index e6e6eaf..79d0101 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -1195,7 +1195,7 @@ PowerPC options:\n\
 -mppc64, -m620		generate code for PowerPC 620/625/630\n\
 -mppc64bridge		generate code for PowerPC 64, including bridge insns\n\
 -mbooke			generate code for 32-bit PowerPC BookE\n\
--mppca2			generate code for A2 architecture\n\
+-ma2			generate code for A2 architecture\n\
 -mpower4		generate code for Power4 architecture\n\
 -mpower5		generate code for Power5 architecture\n\
 -mpower6		generate code for Power6 architecture\n\
diff --git a/gas/doc/c-ppc.texi b/gas/doc/c-ppc.texi
index 3267546..9e7972c 100644
--- a/gas/doc/c-ppc.texi
+++ b/gas/doc/c-ppc.texi
@@ -73,7 +73,7 @@ Generate code for PowerPC 64, including bridge insns.
 @item -mbooke
 Generate code for 32-bit BookE.
 
-@item -mppca2
+@item -ma2
 Generate code for A2 architecture.
 
 @item -me300
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8c151a4..81f3f35 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-01  Peter Bergner  <bergner@vnet.ibm.com>
+
+	* gas/ppc/a2.d: Rename "ppca2" to "a2".
+
 2009-09-29  DJ Delorie  <dj@redhat.com>
 
 	* gas/rx: New directory.
diff --git a/gas/testsuite/gas/ppc/a2.d b/gas/testsuite/gas/ppc/a2.d
index fbc9ff6..4348663 100644
--- a/gas/testsuite/gas/ppc/a2.d
+++ b/gas/testsuite/gas/ppc/a2.d
@@ -1,6 +1,6 @@
-#as: -mppca2
-#objdump: -dr -Mppca2
-#name: PPCA2 tests
+#as: -ma2
+#objdump: -dr -Ma2
+#name: A2 tests
 
 
 .*: +file format elf(32)?(64)?-powerpc.*
diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 2fddcdf..8a86f4b 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-01  Peter Bergner  <bergner@vnet.ibm.com>
+
+	* ppc.h (PPC_OPCODE_A2): Rename from PPC_OPCODE_PPCA2.
+
 2009-09-29  DJ Delorie  <dj@redhat.com>
 
 	* rx.h: New file.
diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h
index c88485a..4e147eb 100644
--- a/include/opcode/ppc.h
+++ b/include/opcode/ppc.h
@@ -168,7 +168,7 @@ extern const int powerpc_num_opcodes;
 #define PPC_OPCODE_VSX		 0x80000000
 
 /* Opcode is supported by A2.  */
-#define PPC_OPCODE_PPCA2	 0x100000000ULL
+#define PPC_OPCODE_A2	 	0x100000000ULL
 
 /* A macro to extract the major opcode from an instruction.  */
 #define PPC_OP(i) (((i) >> 26) & 0x3f)
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 5be200c..fd7f346 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-01  Peter Bergner  <bergner@vnet.ibm.com>
+
+	* ppc-opc.c (PPCA2): Use renamed mask PPC_OPCODE_A2.
+	* ppc-dis.c (ppc_opts): Likewise.
+	Rename "ppca2" to "a2".
+
 2009-10-01  M R Swami Reddy <MR.Swami.Reddy@nsc.com>
 
 	* crx-dis.c (match_opcode): Truncate mcode to 32-bit.
diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c
index 70d2bee..3af02bc 100644
--- a/opcodes/ppc-dis.c
+++ b/opcodes/ppc-dis.c
@@ -141,9 +141,9 @@ struct ppc_mopt ppc_opts[] = {
   { "ppc64bridge", (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_64_BRIDGE
 		    | PPC_OPCODE_64),
     0 },
-  { "ppca2",   (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_ISEL
+  { "a2",      (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC | PPC_OPCODE_ISEL
 		| PPC_OPCODE_POWER4 | PPC_OPCODE_POWER5 | PPC_OPCODE_CACHELCK
-		| PPC_OPCODE_64 | PPC_OPCODE_PPCA2),
+		| PPC_OPCODE_64 | PPC_OPCODE_A2),
     0 },
   { "ppcps",   (PPC_OPCODE_PPC | PPC_OPCODE_PPCPS),
     0 },
diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
index 8420bb6..4b1b990 100644
--- a/opcodes/ppc-opc.c
+++ b/opcodes/ppc-opc.c
@@ -1933,7 +1933,7 @@ extract_dm (unsigned long insn,
 #define PPCCHLK PPC_OPCODE_CACHELCK
 #define PPCRFMCI	PPC_OPCODE_RFMCI
 #define E500MC  PPC_OPCODE_E500MC
-#define PPCA2	PPC_OPCODE_PPCA2
+#define PPCA2	PPC_OPCODE_A2
 
 /* The opcode table.