* gas/ppc/ppc.exp: Don't run e500 test on xcoff targets.

	* gas/ppc/astest2.d: Escape dots.

3 files changed, 25 insertions, 23 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 539a6f6100..5de9b6f0bd 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* gas/ppc/ppc.exp: Don't run e500 test on xcoff targets.
+	* gas/ppc/astest2.d: Escape dots.
+
 2002-08-20  Richard Sandiford  <rsandifo@redhat.com>
 
 	* gas/mips/rol.s: Add rotate by zero tests.
diff --git a/gas/testsuite/gas/ppc/astest2.d b/gas/testsuite/gas/ppc/astest2.d
index 740e3bfe19..297f4bebaa 100644
--- a/gas/testsuite/gas/ppc/astest2.d
+++ b/gas/testsuite/gas/ppc/astest2.d
@@ -3,7 +3,7 @@
 
 .*: +file format elf32-powerpc
 
-Disassembly of section .text:
+Disassembly of section \.text:
 
 0+0000000 <foo>:
    0:	60 00 00 00 	nop
@@ -14,7 +14,7 @@ Disassembly of section .text:
   14:	48 00 00 00 	b	14 <foo\+0x14>
 			14: R_PPC_REL24	x
   18:	48 00 00 04 	b	1c <foo\+0x1c>
-			18: R_PPC_REL24	.data\+0x4
+			18: R_PPC_REL24	\.data\+0x4
   1c:	48 00 00 00 	b	1c <foo\+0x1c>
 			1c: R_PPC_REL24	z
   20:	48 00 00 14 	b	34 <foo\+0x34>
@@ -30,16 +30,16 @@ Disassembly of section .text:
 			38: R_PPC_LOCAL24PC	a
   3c:	48 00 00 40 	b	7c <apfour>
 
-  40:	00 00 00 40 	.long 0x40
-			40: R_PPC_ADDR32	.text\+0x40
+  40:	00 00 00 40 	\.long 0x40
+			40: R_PPC_ADDR32	\.text\+0x40
 
-  44:	00 00 00 4c 	.long 0x4c
-			44: R_PPC_ADDR32	.text\+0x4c
-  48:	00 00 00 00 	.long 0x0
+  44:	00 00 00 4c 	\.long 0x4c
+			44: R_PPC_ADDR32	\.text\+0x4c
+  48:	00 00 00 00 	\.long 0x0
 			48: R_PPC_REL32	x
-  4c:	00 00 00 04 	.long 0x4
+  4c:	00 00 00 04 	\.long 0x4
 			4c: R_PPC_REL32	x\+0x4
-	...
+	\.\.\.
 			50: R_PPC_REL32	z
 			54: R_PPC_REL32	y
 			58: R_PPC_ADDR32	x
@@ -51,25 +51,25 @@ Disassembly of section .text:
 			68: R_PPC_ADDR32	y\+0xf+ffffffc
   6c:	ff ff ff fc 	fnmsub	f31,f31,f31,f31
 			6c: R_PPC_ADDR32	z\+0xf+ffffffc
-  70:	00 00 00 08 	.long 0x8
-  74:	00 00 00 08 	.long 0x8
+  70:	00 00 00 08 	\.long 0x8
+  74:	00 00 00 08 	\.long 0x8
 
 0+0000078 <a>:
-  78:	00 00 00 00 	.long 0x0
+  78:	00 00 00 00 	\.long 0x0
 			78: R_PPC_ADDR32	a
 
 0+000007c <apfour>:
-	...
+	\.\.\.
 			7c: R_PPC_ADDR32	b
 			80: R_PPC_ADDR32	apfour
   84:	ff ff ff fc 	fnmsub	f31,f31,f31,f31
-  88:	00 00 00 02 	.long 0x2
+  88:	00 00 00 02 	\.long 0x2
 			88: R_PPC_ADDR32	apfour\+0x2
-  8c:	00 00 00 00 	.long 0x0
-Disassembly of section .data:
+  8c:	00 00 00 00 	\.long 0x0
+Disassembly of section \.data:
 
 0+0000000 <x>:
-   0:	00 00 00 00 	.long 0x0
+   0:	00 00 00 00 	\.long 0x0
 
 0+0000004 <y>:
-   4:	00 00 00 00 	.long 0x0
+   4:	00 00 00 00 	\.long 0x0
diff --git a/gas/testsuite/gas/ppc/ppc.exp b/gas/testsuite/gas/ppc/ppc.exp
index d2c72924fa..eda443bf9d 100644
--- a/gas/testsuite/gas/ppc/ppc.exp
+++ b/gas/testsuite/gas/ppc/ppc.exp
@@ -27,7 +27,7 @@ if { [istarget powerpc64*-*-*] || [istarget *-*-elf64*]} then {
 if { [istarget powerpc*-*-*] } then {
    run_dump_test "simpshft"
 
-    if { [istarget powerpc-ibm-aix*] } then {
+    if { [istarget powerpc-*-*aix*] } then {
 	run_dump_test "altivec_xcoff"
 	run_dump_test "altivec_xcoff64"
 	run_dump_test "booke_xcoff"
@@ -35,9 +35,6 @@ if { [istarget powerpc*-*-*] } then {
     } else {
 	run_dump_test "altivec"
 	run_dump_test "booke"
+	run_dump_test "e500"
     }
 }
-
-if { [istarget powerpc*-*-*] } then {
-   run_dump_test "e500"
-}