opcodes/

	* ppc-dis.c (powerpc_init_dialect): Do not set PPC_OPCODE_BOOKE
	for -Mbooke.
	(print_ppc_disassembler_options): Update usage.
	* ppc-opc.c (DE, DES, DEO, DE_MASK): Remove.
	(BOOKE64): Remove.
	(PPCCHLK64): Likewise.
	(powerpc_opcodes): Remove all BOOKE64 instructions.

gas/
	* config/tc-ppc.c (parse_cpu): Remove booke64 support. Update
	usage strings.
	(ppc_setup_opcodes): Likewise, remove booke64 support.
	* doc/c-ppc.texi (PowerPC-Opts): Remove -mbooke32 and -mbooke64.
	* doc/as.texinfo (Overview): Likewise.

binutils/
	* doc/binutils.texi (objdump): Update booke documentation.
	* NEWS: Document user-visible changes to command line options.

11 files changed, 63 insertions, 294 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 004a620..cde9b85 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-04  Ben Elliston  <bje@au.ibm.com>
+
+	* config/tc-ppc.c (parse_cpu): Remove booke64 support. Update
+	usage strings.
+	(ppc_setup_opcodes): Likewise, remove booke64 support.
+	* doc/c-ppc.texi (PowerPC-Opts): Remove -mbooke32 and -mbooke64.
+	* doc/as.texinfo (Overview): Likewise.
+
 2008-12-04  Nick Clifton  <nickc@redhat.com>
 
 	* doc/as.texinfo (Type): Reword description of STT_IFUNC type.
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 648ed72..cf67a01 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -919,12 +919,6 @@ parse_cpu (const char *arg)
     {
       ppc_cpu = PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_32;
     }
-  /* -mbooke64 means enable 64-bit BookE support.  */
-  else if (strcmp (arg, "booke64") == 0)
-    {
-      ppc_cpu = (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE
-		 | PPC_OPCODE_BOOKE64 | PPC_OPCODE_64);
-    }
   else if (strcmp (arg, "power4") == 0)
     {
       ppc_cpu = (PPC_OPCODE_PPC | PPC_OPCODE_CLASSIC
@@ -1149,8 +1143,7 @@ PowerPC options:\n\
   fprintf (stream, _("\
 -mppc64, -m620		generate code for PowerPC 620/625/630\n\
 -mppc64bridge		generate code for PowerPC 64, including bridge insns\n\
--mbooke64		generate code for 64-bit PowerPC BookE\n\
--mbooke, mbooke32	generate code for 32-bit PowerPC BookE\n\
+-mbooke			generate code for 32-bit PowerPC BookE\n\
 -mpower4		generate code for Power4 architecture\n\
 -mpower5		generate code for Power5 architecture\n\
 -mpower6		generate code for Power6 architecture\n\
@@ -1359,8 +1352,7 @@ ppc_setup_opcodes (void)
 
 		 There are also cases where the table needs to be out
 		 of order to disassemble the correct instruction for
-		 processor variants.  eg. "lhae" booke64 insn must be
-		 found before "ld" ppc64 insn.  */
+		 processor variants.  */
 	      else if (0)
 		{
 		  unsigned long t1 = op[0].opcode;
@@ -1420,14 +1412,6 @@ ppc_setup_opcodes (void)
 	      || ((op->flags & (PPC_OPCODE_32 | PPC_OPCODE_64))
 		  == (ppc_cpu & (PPC_OPCODE_32 | PPC_OPCODE_64)))
 	      || (ppc_cpu & PPC_OPCODE_64_BRIDGE) != 0)
-	  /* Certain instructions (eg: extsw) do not exist in the
-	     32-bit BookE instruction set, but they do exist in the
-	     64-bit BookE instruction set, and other PPC instruction
-	     sets.  Check to see if the opcode has the BOOKE64 flag set.
-	     If it does make sure that the target CPU is not the BookE32.  */
-	  && ((op->flags & PPC_OPCODE_BOOKE64) == 0
-	      || (ppc_cpu & PPC_OPCODE_BOOKE64) == PPC_OPCODE_BOOKE64
-	      || (ppc_cpu & PPC_OPCODE_BOOKE) == 0)
 	  && ((ppc_cpu & PPC_OPCODE_POWER4) == 0
 	      || (op->flags & PPC_OPCODE_NOPOWER4) == 0))
 	{
diff --git a/gas/doc/as.texinfo b/gas/doc/as.texinfo
index a5d936b..d1f60dd 100644
--- a/gas/doc/as.texinfo
+++ b/gas/doc/as.texinfo
@@ -409,8 +409,7 @@ gcc(1), ld(1), and the Info entries for @file{binutils} and @file{ld}.
 
 @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{-mbooke32}|@b{-mbooke64}]
+    @b{-m403}|@b{-m405}|@b{-mppc64}|@b{-m620}|@b{-mppc64bridge}|@b{-mbooke}]
    [@b{-mcom}|@b{-many}|@b{-maltivec}|@b{-mvsx}] [@b{-memb}]
    [@b{-mregnames}|@b{-mno-regnames}]
    [@b{-mrelocatable}|@b{-mrelocatable-lib}]
diff --git a/gas/doc/c-ppc.texi b/gas/doc/c-ppc.texi
index bc65685..70877cd 100644
--- a/gas/doc/c-ppc.texi
+++ b/gas/doc/c-ppc.texi
@@ -70,10 +70,7 @@ Generate code for Motorola SPE instructions.
 @item -mppc64bridge
 Generate code for PowerPC 64, including bridge insns.
 
-@item -mbooke64
-Generate code for 64-bit BookE.
-
-@item -mbooke, mbooke32
+@item -mbooke
 Generate code for 32-bit BookE.
 
 @item -me300
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 523275a..3335301 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2008-12-04  Ben Elliston  <bje@au.ibm.com>
+
+	* gas/ppc/booke.s: Remove booke64 instructions.
+	* gas/ppc/booke.d: Update expected disassembly output.
+	* gas/ppc/booke_xcoff.s: Use -mbooke/-Mbooke.
+	* gas/ppc/booke_xcoff.d: Likewise.
+	* gas/ppc/booke_xcoff64.d: Likewise.
+	* gas/ppc/booke_xcoff64.s: Likewise.
+
 2008-12-03  Nick Clifton  <nickc@redhat.com>
 
 	* gas/elf/type.s: Add test of STT_IFUNC symbol type.
diff --git a/gas/testsuite/gas/ppc/booke.d b/gas/testsuite/gas/ppc/booke.d
index b07033f..403fa3f 100644
--- a/gas/testsuite/gas/ppc/booke.d
+++ b/gas/testsuite/gas/ppc/booke.d
@@ -1,4 +1,4 @@
-#as: -mbooke64
+#as: -mbooke
 #objdump: -dr -Mbooke
 #name: BookE tests
 
@@ -6,151 +6,35 @@
 
 Disassembly of section \.text:
 
-0+0000000 <start>:
-   0:	24 25 00 30 	bce     1,4\*cr1\+gt,30 <branch_target_1>
-   4:	24 46 00 3d 	bcel    2,4\*cr1\+eq,40 <branch_target_2>
-   8:	24 67 00 52 	bcea    3,4\*cr1\+so,50 <branch_target_3>
-			8: R_PPC(64)?_ADDR14	\.text\+0x50
-   c:	24 88 00 73 	bcela   4,4\*cr2\+lt,70 <branch_target_4>
-			c: R_PPC(64)?_ADDR14	\.text\+0x70
-  10:	4c a9 00 22 	bclre   5,4\*cr2\+gt
-  14:	4c aa 00 23 	bclrel  5,4\*cr2\+eq
-  18:	4d 0b 04 22 	bcctre  8,4\*cr2\+so
-  1c:	4d 0c 04 23 	bcctrel 8,4\*cr3\+lt
-  20:	58 00 00 74 	be      94 <branch_target_5>
-  24:	58 00 00 89 	bel     ac <branch_target_6>
-  28:	58 00 00 f6 	bea     f4 <branch_target_7>
-			28: R_PPC(64)?_ADDR24	\.text\+0xf4
-  2c:	58 00 01 2b 	bela    128 <branch_target_8>
-			2c: R_PPC(64)?_ADDR24	\.text\+0x128
-
-0+0000030 <branch_target_1>:
-  30:	e9 09 00 80 	lbze    r8,8\(r9\)
-  34:	e9 8f 00 41 	lbzue   r12,4\(r15\)
-  38:	7c 86 40 fe 	lbzuxe  r4,r6,r8
-  3c:	7c 65 38 be 	lbzxe   r3,r5,r7
-
-0+0000040 <branch_target_2>:
-  40:	f8 a6 06 40 	lde     r5,400\(r6\)
-  44:	f8 c7 07 11 	ldue    r6,452\(r7\)
-  48:	7c e8 4e 3e 	ldxe    r7,r8,r9
-  4c:	7d 4b 66 7e 	lduxe   r10,r11,r12
-
-0+0000050 <branch_target_3>:
-  50:	f9 81 02 06 	lfde    f12,128\(r1\)
-  54:	f8 25 00 47 	lfdue   f1,16\(r5\)
-  58:	7c a1 1c be 	lfdxe   f5,r1,r3
-  5c:	7c c2 24 fe 	lfduxe  f6,r2,r4
-  60:	f9 09 00 c4 	lfse    f8,48\(r9\)
-  64:	f9 2a 01 15 	lfsue   f9,68\(r10\)
-  68:	7d 44 44 7e 	lfsuxe  f10,r4,r8
-  6c:	7d 23 3c 3e 	lfsxe   f9,r3,r7
-
-0+0000070 <branch_target_4>:
-  70:	e9 45 03 24 	lhae    r10,50\(r5\)
-  74:	e8 23 00 55 	lhaue   r1,5\(r3\)
-  78:	7c a1 1a fe 	lhauxe  r5,r1,r3
-  7c:	7f be fa be 	lhaxe   r29,r30,r31
-  80:	7c 22 1e 3c 	lhbrxe  r1,r2,r3
-  84:	e8 83 01 22 	lhze    r4,18\(r3\)
-  88:	e8 c9 01 43 	lhzue   r6,20\(r9\)
-  8c:	7c a7 4a 7e 	lhzuxe  r5,r7,r9
-  90:	7d 27 2a 3e 	lhzxe   r9,r7,r5
-
-0+0000094 <branch_target_5>:
-  94:	7d 4f a0 fc 	lwarxe  r10,r15,r20
-  98:	7c aa 94 3c 	lwbrxe  r5,r10,r18
-  9c:	eb 9d 00 46 	lwze    r28,4\(r29\)
-  a0:	e9 0a 02 87 	lwzue   r8,40\(r10\)
-  a4:	7c 66 48 7e 	lwzuxe  r3,r6,r9
-  a8:	7f dd e0 3e 	lwzxe   r30,r29,r28
-
-0+00000ac <branch_target_6>:
-  ac:	7c 06 3d fc 	dcbae   r6,r7
-  b0:	7c 08 48 bc 	dcbfe   r8,r9
-  b4:	7c 0a 5b bc 	dcbie   r10,r11
-  b8:	7c 08 f0 7c 	dcbste  r8,r30
-  bc:	7c c3 0a 3c 	dcbte   6,r3,r1
-  c0:	7c a4 11 fa 	dcbtste 5,r4,r2
-  c4:	7c 0f 77 fc 	dcbze   r15,r14
-  c8:	7c 03 27 bc 	icbie   r3,r4
-  cc:	7c a8 48 2c 	icbt    5,r8,r9
-  d0:	7c ca 78 3c 	icbte   6,r10,r15
-  d4:	7c a6 02 26 	mfapidi r5,r6
-  d8:	7c 07 46 24 	tlbivax r7,r8
-  dc:	7c 09 56 26 	tlbivaxe r9,r10
-  e0:	7c 0b 67 24 	tlbsx   r11,r12
-  e4:	7c 0d 77 26 	tlbsxe  r13,r14
-  e8:	7c 00 07 a4 	tlbwe   
-  ec:	7c 00 07 a4 	tlbwe   
-  f0:	7c 21 0f a4 	tlbwe   r1,r1,1
-
-0+00000f4 <branch_target_7>:
-  f4:	7c 22 1b 14 	adde64  r1,r2,r3
-  f8:	7c 85 37 14 	adde64o r4,r5,r6
-  fc:	7c e8 03 d4 	addme64 r7,r8
- 100:	7d 2a 07 d4 	addme64o r9,r10
- 104:	7d 6c 03 94 	addze64 r11,r12
- 108:	7d ae 07 94 	addze64o r13,r14
- 10c:	7e 80 04 40 	mcrxr64 cr5
- 110:	7d f0 8b 10 	subfe64 r15,r16,r17
- 114:	7e 53 a7 10 	subfe64o r18,r19,r20
- 118:	7e b6 03 d0 	subfme64 r21,r22
- 11c:	7e f8 07 d0 	subfme64o r23,r24
- 120:	7f 3a 03 90 	subfze64 r25,r26
- 124:	7f 7c 07 90 	subfze64o r27,r28
-
-0+0000128 <branch_target_8>:
- 128:	e8 22 03 28 	stbe    r1,50\(r2\)
- 12c:	e8 64 02 89 	stbue   r3,40\(r4\)
- 130:	7c a6 39 fe 	stbuxe  r5,r6,r7
- 134:	7d 09 51 be 	stbxe   r8,r9,r10
- 138:	7d 6c 6b ff 	stdcxe\. r11,r12,r13
- 13c:	f9 cf 00 78 	stde    r14,28\(r15\)
- 140:	fa 11 00 59 	stdue   r16,20\(r17\)
- 144:	7e 53 a7 3e 	stdxe   r18,r19,r20
- 148:	7e b6 bf 7e 	stduxe  r21,r22,r23
- 14c:	f8 38 00 3e 	stfde   f1,12\(r24\)
- 150:	f8 59 00 0f 	stfdue  f2,0\(r25\)
- 154:	7c 7a dd be 	stfdxe  f3,r26,r27
- 158:	7c 9c ed fe 	stfduxe f4,r28,r29
- 15c:	7c be ff be 	stfiwxe f5,r30,r31
- 160:	f8 de 00 6c 	stfse   f6,24\(r30\)
- 164:	f8 fd 00 5d 	stfsue  f7,20\(r29\)
- 168:	7d 1c dd 3e 	stfsxe  f8,r28,r27
- 16c:	7d 3a cd 7e 	stfsuxe f9,r26,r25
- 170:	7f 17 b7 3c 	sthbrxe r24,r23,r22
- 174:	ea b4 01 ea 	sthe    r21,30\(r20\)
- 178:	ea 72 02 8b 	sthue   r19,40\(r18\)
- 17c:	7e 30 7b 7e 	sthuxe  r17,r16,r15
- 180:	7d cd 63 3e 	sthxe   r14,r13,r12
- 184:	7d 6a 4d 3c 	stwbrxe r11,r10,r9
- 188:	7d 07 31 3d 	stwcxe\. r8,r7,r6
- 18c:	e8 a4 03 2e 	stwe    r5,50\(r4\)
- 190:	e8 62 02 8f 	stwue   r3,40\(r2\)
- 194:	7c 22 19 7e 	stwuxe  r1,r2,r3
- 198:	7c 85 31 3e 	stwxe   r4,r5,r6
- 19c:	4c 00 00 66 	rfci
- 1a0:	7c 60 01 06 	wrtee   r3
- 1a4:	7c 00 81 46 	wrteei  1
- 1a8:	7c 85 02 06 	mfdcrx  r4,r5
- 1ac:	7c aa 3a 86 	mfdcr   r5,234
- 1b0:	7c e6 03 06 	mtdcrx  r6,r7
- 1b4:	7d 10 6b 86 	mtdcr   432,r8
- 1b8:	7c 00 04 ac 	msync
- 1bc:	7c 09 55 ec 	dcba    r9,r10
- 1c0:	7c 00 06 ac 	mbar    
- 1c4:	7c 00 06 ac 	mbar    
- 1c8:	7c 20 06 ac 	mbar    1
- 1cc:	7d 8d 77 24 	tlbsx   r12,r13,r14
- 1d0:	7d 8d 77 25 	tlbsx\.  r12,r13,r14
- 1d4:	7d 8d 77 26 	tlbsxe  r12,r13,r14
- 1d8:	7d 8d 77 27 	tlbsxe\. r12,r13,r14
- 1dc:	7c 12 42 a6 	mfsprg  r0,2
- 1e0:	7c 12 42 a6 	mfsprg  r0,2
- 1e4:	7c 12 43 a6 	mtsprg  2,r0
- 1e8:	7c 12 43 a6 	mtsprg  2,r0
- 1ec:	7c 07 42 a6 	mfsprg  r0,7
- 1f0:	7c 07 42 a6 	mfsprg  r0,7
- 1f4:	7c 17 43 a6 	mtsprg  7,r0
- 1f8:	7c 17 43 a6 	mtsprg  7,r0
+0+0000000 <branch_target_1>:
+   0:	7c a8 48 2c 	icbt    5,r8,r9
+   4:	7c a6 02 26 	mfapidi r5,r6
+   8:	7c 07 46 24 	tlbivax r7,r8
+   c:	7c 0b 67 24 	tlbsx   r11,r12
+  10:	7c 00 07 a4 	tlbwe   
+  14:	7c 00 07 a4 	tlbwe   
+  18:	7c 21 0f a4 	tlbwe   r1,r1,1
+
+0+000001c <branch_target_2>:
+  1c:	4c 00 00 66 	rfci
+  20:	7c 60 01 06 	wrtee   r3
+  24:	7c 00 81 46 	wrteei  1
+  28:	7c 85 02 06 	mfdcrx  r4,r5
+  2c:	7c aa 3a 86 	mfdcr   r5,234
+  30:	7c e6 03 06 	mtdcrx  r6,r7
+  34:	7d 10 6b 86 	mtdcr   432,r8
+  38:	7c 00 04 ac 	msync
+  3c:	7c 09 55 ec 	dcba    r9,r10
+  40:	7c 00 06 ac 	mbar    
+  44:	7c 00 06 ac 	mbar    
+  48:	7c 20 06 ac 	mbar    1
+  4c:	7d 8d 77 24 	tlbsx   r12,r13,r14
+  50:	7d 8d 77 25 	tlbsx\.  r12,r13,r14
+  54:	7c 12 42 a6 	mfsprg  r0,2
+  58:	7c 12 42 a6 	mfsprg  r0,2
+  5c:	7c 12 43 a6 	mtsprg  2,r0
+  60:	7c 12 43 a6 	mtsprg  2,r0
+  64:	7c 07 42 a6 	mfsprg  r0,7
+  68:	7c 07 42 a6 	mfsprg  r0,7
+  6c:	7c 17 43 a6 	mtsprg  7,r0
+  70:	7c 17 43 a6 	mtsprg  7,r0
diff --git a/gas/testsuite/gas/ppc/booke.s b/gas/testsuite/gas/ppc/booke.s
index fa53c01..4e51305 100644
--- a/gas/testsuite/gas/ppc/booke.s
+++ b/gas/testsuite/gas/ppc/booke.s
@@ -1,127 +1,17 @@
 # Motorola PowerPC BookE tests
-#as: -mbooke32
+#as: -mbooke
 	.section ".text"
-start:
-	bce	1, 5, branch_target_1
-	bcel	2, 6, branch_target_2
-	bcea	3, 7, branch_target_3
-	bcela	4, 8, branch_target_4
-	bclre	5, 9
-	bclrel	5, 10
-	bcctre	8, 11
-	bcctrel	8, 12
-	be	branch_target_5
-	bel	branch_target_6
-	bea	branch_target_7
-	bela	branch_target_8
 
-branch_target_1:
-	lbze	8, 8(9)
-	lbzue	12, 4(15)
-	lbzuxe	4, 6, 8
-	lbzxe	3, 5, 7
-
-branch_target_2:
-	lde	5, 400(6)
-	ldue	6, 452(7)
-	ldxe	7, 8, 9
-	lduxe	10, 11, 12
-
-branch_target_3:
-	lfde	12, 128(1)
-	lfdue	1, 16(5)
-	lfdxe	5, 1, 3
-	lfduxe	6, 2, 4
-	lfse	8, 48(9)
-	lfsue	9, 68(10)
-	lfsuxe	10, 4, 8
-	lfsxe	9, 3, 7
-
-branch_target_4:
-	lhae	10, 50(5)
-	lhaue	1, 5(3)	
-	lhauxe	5, 1, 3
-	lhaxe	29, 30, 31
-	lhbrxe	1, 2, 3
-	lhze	4, 18(3)
-	lhzue	6, 20(9)
-	lhzuxe	5, 7, 9
-	lhzxe	9, 7, 5
-
-branch_target_5:
-	lwarxe	10, 15, 20
-	lwbrxe	5, 10, 18
-	lwze	28, 4(29)
-	lwzue	8, 40(10)
-	lwzuxe	3, 6, 9
-	lwzxe	30, 29, 28
-
-branch_target_6:
-	dcbae	6, 7
-	dcbfe	8, 9
-	dcbie	10, 11
-	dcbste	8, 30
-	dcbte	6, 3, 1
-	dcbtste	5, 4, 2
-	dcbze	15, 14
-	icbie	3, 4
+branch_target_1:	
 	icbt	5, 8, 9	
-	icbte	6, 10, 15
 	mfapidi	5, 6
 	tlbivax	7, 8
-	tlbivaxe 9, 10	
 	tlbsx	11, 12
-	tlbsxe	13, 14
 	tlbwe
 	tlbwe	0,0,0
 	tlbwe	1,1,1
 
-branch_target_7:
-	adde64	1, 2, 3
-	adde64o	4, 5, 6
-	addme64 7, 8
-	addme64o 9, 10
-	addze64 11, 12
-	addze64o 13, 14
-	mcrxr64 5
-	subfe64 15, 16, 17
-	subfe64o 18, 19, 20
-	subfme64 21, 22
-	subfme64o 23, 24
-	subfze64 25, 26
-	subfze64o 27, 28
-
-branch_target_8:
-	stbe	1, 50(2)
-	stbue	3, 40(4)
-	stbuxe	5, 6, 7
-	stbxe	8, 9, 10
-	stdcxe.	11, 12, 13
-	stde	14, 28(15)
-	stdue	16, 20(17)
-	stdxe	18, 19, 20
-	stduxe	21, 22, 23
-	stfde	1, 12(24)
-	stfdue	2, 0(25)
-	stfdxe	3, 26, 27
-	stfduxe 4, 28, 29
-	stfiwxe	5, 30, 31
-	stfse	6, 24(30)
-	stfsue	7, 20(29)
-	stfsxe	8, 28, 27
-	stfsuxe	9, 26, 25
-	sthbrxe	24, 23, 22
-	sthe	21, 30(20)
-	sthue	19, 40(18)
-	sthuxe	17, 16, 15
-	sthxe	14, 13, 12
-	stwbrxe	11, 10, 9
-	stwcxe.	8, 7, 6
-	stwe	5, 50(4)
-	stwue	3, 40(2)
-	stwuxe	1, 2, 3
-	stwxe	4, 5, 6
-
+branch_target_2:	
 	rfci
 	wrtee	3
 	wrteei	1
@@ -137,8 +27,6 @@ branch_target_8:
 
 	tlbsx	12, 13, 14
 	tlbsx.	12, 13, 14
-	tlbsxe	12, 13, 14
-	tlbsxe.	12, 13, 14
 
 	mfsprg 0, 2
 	mfsprg2 0
diff --git a/gas/testsuite/gas/ppc/booke_xcoff.d b/gas/testsuite/gas/ppc/booke_xcoff.d
index dfb308d..fee6970 100644
--- a/gas/testsuite/gas/ppc/booke_xcoff.d
+++ b/gas/testsuite/gas/ppc/booke_xcoff.d
@@ -1,5 +1,5 @@
-#as: -mppc32 -mbooke32
-#objdump: -mpowerpc -dr -Mbooke32
+#as: -mppc32 -mbooke
+#objdump: -mpowerpc -dr -Mbooke
 #name: xcoff BookE tests
 
 .*:     file format aixcoff-rs6000
diff --git a/gas/testsuite/gas/ppc/booke_xcoff.s b/gas/testsuite/gas/ppc/booke_xcoff.s
index db3578d..7475a46 100644
--- a/gas/testsuite/gas/ppc/booke_xcoff.s
+++ b/gas/testsuite/gas/ppc/booke_xcoff.s
@@ -1,5 +1,5 @@
 # Motorola PowerPC BookE tests
-#as: -mbooke32
+#as: -mbooke
 	.csect .text[PR]
 	.csect main[DS]
 main:
diff --git a/gas/testsuite/gas/ppc/booke_xcoff64.d b/gas/testsuite/gas/ppc/booke_xcoff64.d
index bd0e6c8..4a301bd 100644
--- a/gas/testsuite/gas/ppc/booke_xcoff64.d
+++ b/gas/testsuite/gas/ppc/booke_xcoff64.d
@@ -1,5 +1,5 @@
-#as: -a64 -mppc64 -mbooke64
-#objdump: -dr -Mbooke64
+#as: -a64 -mppc64 -mbooke
+#objdump: -dr -Mbooke
 #name: xcoff64 BookE tests
 
 .*:     file format aix5?coff64-rs6000
diff --git a/gas/testsuite/gas/ppc/booke_xcoff64.s b/gas/testsuite/gas/ppc/booke_xcoff64.s
index e915703..f3f58b3 100644
--- a/gas/testsuite/gas/ppc/booke_xcoff64.s
+++ b/gas/testsuite/gas/ppc/booke_xcoff64.s
@@ -1,5 +1,5 @@
 # Motorola PowerPC BookE tests
-#as: -a64 -mppc64 -mbooke64
+#as: -a64 -mppc64 -mbooke
 	.csect .text[PR]
 	.csect main[DS]
 main: