2002-04-30 Chris Demetriou <cgd@broadcom.com>

        Merge from mainline:
        2002-03-15  Chris G. Demetriou  <cgd@broadcom.com>
        * gas/mips/mips.exp: Use elf-rel2 and elfel-rel2 for
        mipsisa32*-*-* targets, rather than e32-rel2 and e32el-rel2.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index d7c3b6f474c8b3989754590644ac3889199d1839..a5a8d3297529174be168eaeb52f223f2d6f7a27a 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-30  Chris Demetriou  <cgd@broadcom.com>
+
+       Merge from mainline:
+       2002-03-15  Chris G. Demetriou  <cgd@broadcom.com> 
+       * gas/mips/mips.exp: Use elf-rel2 and elfel-rel2 for
+       mipsisa32*-*-* targets, rather than e32-rel2 and e32el-rel2.
+
 2002-04-27  Alan Modra  <amodra@bigpond.net.au>
 
        Merge from mainline.

diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 2b977d312d9fb543bfc31e5e73da31fd8df29dd1..8ffc3709dbfaada9bd5df3d3ce37c33d9bc3387b 100644 (file)
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -179,14 +179,17 @@ if { [istarget mips*-*-*] } then {
        run_dump_test "mips-abi32-pic"
 
        run_dump_test "elf${el}-rel"
-       if [istarget mips64*-*-*] { 
+       if {[istarget mips64*-*-*] || [istarget mipsisa32*-*-*]} { 
            run_dump_test "elf${el}-rel2"
-           run_dump_test "elf-rel4"
-       } {
+       } else {
            run_dump_test "e32${el}-rel2"
-           run_dump_test "e32-rel4"
        }
        run_dump_test "elf${el}-rel3"
+       if {[istarget mips64*-*-*]} {
+           run_dump_test "elf-rel4"
+       } else {
+           run_dump_test "e32-rel4"
+       }
        run_dump_test "elf-rel5"
        run_dump_test "${tmips}${el}empic"
        run_dump_test "empic2"