Don't set interlocks for r5000. Rely on -mips4 settings.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 2084da53bff2b48a45786df28688864d2ddb6c1b..906091b516abe9a8d155607f9b1d2e6d4d1877d4 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -6,8 +6,7 @@ Mon Sep  9 10:57:42 1996  Ian Lance Taylor  <ian@cygnus.com>
        (mips_ip): In cases 'N' and 'M', look for $fccN rather than an
        immediate value.
 
-       * config/tc-mips.c (md_begin): Recognize r5000 for cpu.  If
-       mips_cpu is 5000, set interlocks and cop_interlocks.
+       * config/tc-mips.c (md_begin): Recognize r5000 for cpu.
        (mips_ip): Give a better error message if the ISA level is wrong.
        (md_parse_option): Recognize -mcpu=[v][r]5000.
 

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 4185adb315ecf1d0dcd6279086e7fc6b471d9bc8..fc691c0ab6551aaafc81a34cb7da283e82847051 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -701,16 +701,12 @@ md_begin ()
   if (mips_4100 < 0)
     mips_4100 = 0;
 
-  if (mips_4650
-      || mips_4010
-      || mips_4100
-      || mips_cpu == 4300
-      || mips_cpu == 5000)
+  if (mips_4650 || mips_4010 || mips_4100 || mips_cpu == 4300)
     interlocks = 1;
   else
     interlocks = 0;
 
-  if (mips_cpu == 4300 || mips_cpu == 5000)
+  if (mips_cpu == 4300)
     cop_interlocks = 1;
   else
     cop_interlocks = 0;