rs6000 testsuite update

[Alan Modra <amodra at gmail dot com>]

I'll have to remember than any rs6000-*-aix* in the testsuite should
be accompanied by powerpc*-*-aix*.

	* testsuite/ld-scripts/align.exp: Exclude powerpc*-*-aix*.
	* testsuite/ld-scripts/assign-loc.d: Likewise.
	* testsuite/ld-scripts/defined3.d: Likewise.
	* testsuite/ld-scripts/defined4.d: Likewise.
	* testsuite/ld-scripts/defined5.d: Likewise.
	* testsuite/ld-scripts/expr2.d: Likewise.
	* testsuite/ld-scripts/provide.exp: Likewise.
	* testsuite/ld-scripts/sane1.d: Likewise.
	* testsuite/ld-scripts/size.exp: Likewise.
	* testsuite/ld-scripts/defined2.d: Don't xfail rs6000-*-aix*.

diff --git a/ld/testsuite/ld-scripts/align.exp b/ld/testsuite/ld-scripts/align.exp
index 297aa13..a41db72 100644
--- a/ld/testsuite/ld-scripts/align.exp
+++ b/ld/testsuite/ld-scripts/align.exp
@@ -19,7 +19,7 @@
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-if [istarget "rs6000-*-aix*"] {
+if {[istarget "powerpc*-*-aix*"] || [istarget "rs6000-*-aix*"]} {
     # Target maps .text and .data to other sections.
     return
 }
diff --git a/ld/testsuite/ld-scripts/assign-loc.d b/ld/testsuite/ld-scripts/assign-loc.d
index bf6b9d8..bc0c5a0 100644
--- a/ld/testsuite/ld-scripts/assign-loc.d
+++ b/ld/testsuite/ld-scripts/assign-loc.d
@@ -1,7 +1,7 @@
 #ld: -T assign-loc.t
 #source: data.s
 #nm: -n
-#notarget: rs6000-*-aix*
+#notarget: powerpc*-*-aix* rs6000-*-aix*
 #...
 0+0100 A HEAP_SIZE
 #...
diff --git a/ld/testsuite/ld-scripts/defined2.d b/ld/testsuite/ld-scripts/defined2.d
index 40728bd..6e6e068 100644
--- a/ld/testsuite/ld-scripts/defined2.d
+++ b/ld/testsuite/ld-scripts/defined2.d
@@ -1,7 +1,6 @@
 #ld: -Tdefined2.t
 #nm: -B
 #source: phdrs.s
-#xfail: "rs6000-*-aix*"
 
 # Check that arithmetic on DEFINED works.
 # Matching both A and T accounts for formats that can't tell a .text
diff --git a/ld/testsuite/ld-scripts/defined3.d b/ld/testsuite/ld-scripts/defined3.d
index 61061b6..3401e7c 100644
--- a/ld/testsuite/ld-scripts/defined3.d
+++ b/ld/testsuite/ld-scripts/defined3.d
@@ -2,7 +2,7 @@
 #nm: -B
 #source: phdrs.s
 #source: defined.s
-#xfail: "rs6000-*-aix*"
+#xfail: powerpc*-*-aix* rs6000-*-aix*
 
 # Check that DEFINED matches only symbols defined before its location.
 # The ellipsis account for target-specific symbols.  Matching both A and T
diff --git a/ld/testsuite/ld-scripts/defined4.d b/ld/testsuite/ld-scripts/defined4.d
index b434e40..2f034cb 100644
--- a/ld/testsuite/ld-scripts/defined4.d
+++ b/ld/testsuite/ld-scripts/defined4.d
@@ -1,7 +1,7 @@
 #ld: -Tdefined4.t
 #nm: -B
 #source: defined4.s
-#xfail: rs6000-*-aix*
+#xfail: powerpc*-*-aix* rs6000-*-aix*
 #notarget: mips*-*-* mmix-*-*
 # We check that defined and defined1 have the same address.  MIPS targets
 # use different address. MMIX puts defined and defined1 in text section.
diff --git a/ld/testsuite/ld-scripts/defined5.d b/ld/testsuite/ld-scripts/defined5.d
index 3977c93..8b25743 100644
--- a/ld/testsuite/ld-scripts/defined5.d
+++ b/ld/testsuite/ld-scripts/defined5.d
@@ -1,7 +1,7 @@
 #ld: -Tdefined5.t
 #nm: -B
 #source: defined5.s
-#xfail: rs6000-*-aix*
+#xfail: powerpc*-*-aix* rs6000-*-aix*
 
 # Check that arithmetic on DEFINED works.
 #...
diff --git a/ld/testsuite/ld-scripts/expr2.d b/ld/testsuite/ld-scripts/expr2.d
index 26354f6..b05a5d2 100644
--- a/ld/testsuite/ld-scripts/expr2.d
+++ b/ld/testsuite/ld-scripts/expr2.d
@@ -1,6 +1,6 @@
 # ld: -T expr2.t
 #nm: -B
-#xfail: rs6000-*-aix* arm-*-*aout
+#xfail: arm-*-*aout powerpc*-*-aix* rs6000-*-aix*
 
 #...
 .* D defined
diff --git a/ld/testsuite/ld-scripts/provide.exp b/ld/testsuite/ld-scripts/provide.exp
index f326e73..f42ec76 100644
--- a/ld/testsuite/ld-scripts/provide.exp
+++ b/ld/testsuite/ld-scripts/provide.exp
@@ -23,7 +23,7 @@
 # a.out objdump displays the file header inside the text segment,
 # confusing run_dump_test.
 
-if {[istarget "rs6000-*-aix*"] || [is_aout_format]} {
+if {[istarget "powerpc*-*-aix*"] || [istarget "rs6000-*-aix*"] || [is_aout_format]} {
     unsupported provide-1
     unsupported provide-2
     unsupported provide-3
diff --git a/ld/testsuite/ld-scripts/sane1.d b/ld/testsuite/ld-scripts/sane1.d
index d11a210..e39092e 100644
--- a/ld/testsuite/ld-scripts/sane1.d
+++ b/ld/testsuite/ld-scripts/sane1.d
@@ -1,7 +1,7 @@
 # source: data.s
 # ld: -T sane1.t
 # nm: -B -n
-# notarget: mmix-* pdp11-* rs6000-*-aix* tic30-*-aout
+# notarget: mmix-* pdp11-* powerpc*-*-aix* rs6000-*-aix* tic30-*-aout
 # mmix symbol sections are wrong, pdp sign extends 16-bit addresses
 # rs6000-aix and tic30 don't like empty .text
 
diff --git a/ld/testsuite/ld-scripts/size.exp b/ld/testsuite/ld-scripts/size.exp
index 2d1219d..0caa9c8 100644
--- a/ld/testsuite/ld-scripts/size.exp
+++ b/ld/testsuite/ld-scripts/size.exp
@@ -23,7 +23,7 @@
 # a.out objdump displays the file header inside the text segment,
 # confusing run_dump_test.
 
-if {[istarget "rs6000-*-aix*"] || [is_aout_format]} {
+if {[istarget "powerpc*-*-aix*"] || [istarget "rs6000-*-aix*"] || [is_aout_format]} {
     unsupported size-1
     unsupported size-2
     return

-- 
Alan Modra
Australia Development Lab, IBM