* config/tc-mips.c (hilo_interlocks): True for tx49.

	(md_begin): Add mips64tx49.
	(md_parse_option): Add 4900 cpu.

	* gas/mips/mips.exp: Add tx49 configury.

6 files changed, 93 insertions, 1 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5a5eddb..c205fcc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+start-sanitize-tx49
+Wed Oct 29 16:22:38 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* config/tc-mips.c (hilo_interlocks): True for tx49.
+	(md_begin): Add mips64tx49.
+	(md_parse_option): Add 4900 cpu.
+	
+end-sanitize-tx49
 Fri Oct 24 15:56:47 1997  Ian Lance Taylor  <ian@cygnus.com>
 
 	* config/tc-ppc.c (md_assemble): When handling @l, always sign
diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 2159073..7335e9c 100644
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -230,6 +230,35 @@ else
 	done
 fi
 
+tx49_files="ChangeLog tc-mips.c"
+
+if ( echo $* | grep keep\-tx49 > /dev/null ) ; then
+	for i in $tx49_files ; do
+		if test ! -d $i && (grep sanitize-tx49 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping tx49 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-tx49 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"tx49\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-tx49/,/end\-sanitize\-tx49/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 tic80_files="obj-coff.h"
 
 if ( echo $* | grep keep\-tic80 > /dev/null ) ; then
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 6eecede..314d568 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -220,7 +220,11 @@ static int mips_3900 = -1;
 /* Whether the processor uses hardware interlocks to protect 
    reads from the HI and LO registers, and thus does not
    require nops to be inserted.  */
-#define hilo_interlocks (mips_4010 || mips_cpu == 4300 || mips_3900)
+#define hilo_interlocks (mips_4010 || mips_cpu == 4300 || mips_3900 \
+                         /* start-sanitize-tx49 */                  \
+                         || mips_cpu == 4900                        \
+                         /* end-sanitize-tx49 */                    \
+                         )
 
 /* Whether the processor uses hardware interlocks to protect reads
    from the GPRs, and thus does not require nops to be inserted.  */
@@ -877,6 +881,14 @@ md_begin ()
 	  if (mips_4010 == -1)
 	    mips_4010 = 1;
 	}
+      /* start-sanitize-tx49 */
+      else if (strcmp (cpu, "mips64tx49") == 0)
+	{
+	  mips_opts.isa = 3;
+	  if (mips_cpu == -1)
+	    mips_cpu = 4900;
+	}
+      /* end-sanitize-tx49 */
       else if (strcmp (cpu, "r5000") == 0
 	       || strcmp (cpu, "mips64vr5000") == 0)
 	{
@@ -8542,6 +8554,10 @@ md_parse_option (c, arg)
 		    if (mips_4650 < 0)
 		      mips_4650 = 1;
 		  }
+                /* start-sanitize-tx49 */
+		else if (strcmp (p, "4900") == 0)
+		  mips_cpu = 4900;
+                /* end-sanitize-tx49 */
 		else if (strcmp (p, "4010") == 0)
 		  {
 		    mips_cpu = 4010;
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index c15dbed..ac9b75c 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+start-sanitize-tx49
+Wed Oct 29 16:27:30 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* gas/mips/mips.exp: Add tx49 configury.
+
+end-sanitize-tx49
 Wed Oct 15 10:40:14 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* gas/ieee-fp/x930509a.s: Tweak slightly to work on the PA.
diff --git a/gas/testsuite/gas/mips/.Sanitize b/gas/testsuite/gas/mips/.Sanitize
index 22deea6..c7ca303 100644
--- a/gas/testsuite/gas/mips/.Sanitize
+++ b/gas/testsuite/gas/mips/.Sanitize
@@ -145,4 +145,32 @@ else
 	done
 fi
 
+tx49_files="mips.exp"
+if ( echo $* | grep keep\-tx49 > /dev/null ) ; then
+	for i in $tx49_files ; do
+		if test ! -d $i && (grep sanitize-tx49 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping tx49 stuff in $i
+			fi
+		fi
+	done
+else
+	for i in $tx49_files ; do
+		if test ! -d $i && (grep sanitize-tx49 $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"tx49\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-tx49/,/end-\sanitize\-tx49/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 # End of file.
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index 2acdc2a..f157f5f 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -13,6 +13,11 @@ if [istarget mips*-*-*] then {
     set gpr_ilocks [expr $gpr_ilocks || [istarget mipstx19*-*-*]]
 # end-sanitize-tx19
 
+    #start-sanitize-tx49
+    set ilocks [expr $ilocks || [istarget mips64tx49*-*-*]]
+    #end-sanitize-tx49
+
+
     run_dump_test "abs"
     run_dump_test "add"
     run_dump_test "and"