From 2fe40b6792e98dfe27e4521b2b33fe0f335ea1f0 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 12 Jul 2017 19:22:30 +0930 Subject: [PATCH] rs6000 testsuite update * 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*. --- ld/ChangeLog | 13 +++++++++++++ ld/testsuite/ld-scripts/align.exp | 2 +- ld/testsuite/ld-scripts/assign-loc.d | 2 +- ld/testsuite/ld-scripts/defined2.d | 1 - ld/testsuite/ld-scripts/defined3.d | 2 +- ld/testsuite/ld-scripts/defined4.d | 2 +- ld/testsuite/ld-scripts/defined5.d | 2 +- ld/testsuite/ld-scripts/expr2.d | 2 +- ld/testsuite/ld-scripts/provide.exp | 2 +- ld/testsuite/ld-scripts/sane1.d | 2 +- ld/testsuite/ld-scripts/size.exp | 2 +- 11 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 340e73224b9..1fc71c237aa 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,16 @@ +2017-07-12 Alan Modra + + * 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*. + 2017-07-12 Alan Modra * testsuite/ld-arc/nps-1b.err: Update. diff --git a/ld/testsuite/ld-scripts/align.exp b/ld/testsuite/ld-scripts/align.exp index 297aa13599e..a41db721b89 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 bf6b9d84bb9..bc0c5a03d41 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 40728bdaaff..6e6e068ce57 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 61061b681c7..3401e7cbcd9 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 b434e409455..2f034cb8e0f 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 3977c93ac25..8b2574362f8 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 26354f6df7e..b05a5d22386 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 f326e73bcdf..f42ec76dd77 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 d11a2103ee5..e39092eea55 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 2d1219d0a0b..0caa9c896ef 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 -- 2.30.2