From 2a071788516e5cde6011ee7c9fae365f49be93dc Mon Sep 17 00:00:00 2001
From: Gavin Romig-Koch <gavin@redhat.com>
Date: Thu, 11 Dec 1997 14:28:38 +0000
Subject: [PATCH] Don't run mips16 tests for tx49.

---
 gas/testsuite/ChangeLog         | 21 +++++++++++++++++++++
 gas/testsuite/gas/mips/mips.exp | 15 ++++++++++++---
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ac9b75c..9f4730a 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,4 +1,25 @@
 start-sanitize-tx49
+Thu Dec 11 09:23:05 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* gas/mips/mips.exp: Don't run the mips16 test for tx49.
+
+end-sanitize-tx49
+start-sanitize-vr5400
+Tue Dec  9 13:19:58 1997  Jeffrey A Law  (law@cygnus.com)
+
+        * gas/mips/vr5400.d: Minor tweaks for more accurate matching.
+
+Fri Nov  7 21:32:01 1997  Ken Raeburn  <raeburn@cygnus.com>
+
+	* gas/mips/vr5400.s, gas/mips/vr5400.d: New test, for
+	VR5400-specific instructions.
+	* gas/mips/mips.exp: Run it.
+
+end-sanitize-vr5400
+	* gas/ieee-fp/x930509a.exp: Don't run IEEE FP tests for Vax
+	targets.
+
+start-sanitize-tx49
 Wed Oct 29 16:27:30 1997  Gavin Koch  <gavin@cygnus.com>
 
 	* gas/mips/mips.exp: Add tx49 configury.
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index f157f5f..054e523 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -2,6 +2,7 @@
 # Some generic MIPS tests
 #
 if [istarget mips*-*-*] then {
+    set no_mips16 0
     set svr4pic [expr [istarget *-*-elf*] || [istarget *-*-irix5*] || [istarget *-*-irix6* ] ]
     set empic [expr [istarget *-*-ecoff*] || [istarget *-*-ultrix*] || [istarget *-*-irix\[1-4\]*] ]
     set aout [expr [istarget *-*-bsd*] || [istarget *-*-netbsd*] || [istarget *-*-openbsd*]]
@@ -13,10 +14,15 @@ if [istarget mips*-*-*] then {
     set gpr_ilocks [expr $gpr_ilocks || [istarget mipstx19*-*-*]]
 # end-sanitize-tx19
 
-    #start-sanitize-tx49
+#start-sanitize-tx49
     set ilocks [expr $ilocks || [istarget mips64tx49*-*-*]]
-    #end-sanitize-tx49
+    set no_mips16 [expr $no_mips16 || [istarget mips64tx49*-*-*]]
+#end-sanitize-tx49
 
+# start-sanitize-vr5400
+    set ilocks [expr $ilocks || [istarget mips64vr5400*-*-*]]
+    set gpr_ilocks [expr $gpr_ilocks || [istarget mips64vr5400*-*-*]]
+# end-sanitize-vr5400
 
     run_dump_test "abs"
     run_dump_test "add"
@@ -67,7 +73,10 @@ if [istarget mips*-*-*] then {
     }
     # The mips16 test can only be run on ELF, because only ELF
     # supports the necessary mips16 reloc.
-    if $svr4pic { run_dump_test "mips16" }
+    if { $svr4pic && !$no_mips16 } { run_dump_test "mips16" }
     run_dump_test "delay"
     run_dump_test "nodelay"
+# start-sanitize-vr5400
+    run_dump_test "vr5400"
+# end-sanitize-vr5400
 }
-- 
2.7.4