From 6fd819cfff61e8dc011f214988ee73c2ebc2624f Mon Sep 17 00:00:00 2001
From: Gavin Romig-Koch <gavin@redhat.com>
Date: Wed, 8 Oct 1997 04:17:08 +0000
Subject: [PATCH] config/tc-mips.c (md_begin): Replace the TARGET_CPU value of
 mipsr3900 with mipstx39.

config/tc-mips.c (mips_ip): Don't print the 'opcode requires
-mipsXX message' if the insn isn't an ISA insn.
---
 gas/ChangeLog        | 8 ++++++++
 gas/config/tc-mips.c | 9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 60a73455203..8132ef2ffdb 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+Wed Oct  8 00:04:05 1997  Gavin Koch  <gavin@cygnus.com>
+
+	* config/tc-mips.c (md_begin): Replace the TARGET_CPU value
+	of mipsr3900 with mipstx39.
+
+	* config/tc-mips.c (mips_ip): Don't print the 'opcode requires 
+	-mipsXX message' if the insn isn't an ISA insn.
+
 Tue Oct  7 12:48:30 1997  Doug Evans  <dje@canuck.cygnus.com>
 
 	* config/tc-sparc.h (TARGET_FORMAT support): Moved to tc-sparc.c.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index cb7f0bde595..567758d4e5a 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -104,7 +104,9 @@ static char *mips_regmask_frag;
 extern int target_big_endian;
 
 /* 1 is we should use the 64 bit MIPS ELF ABI, 0 if we should use the
-   32 bit ABI.  This has no meaning for ECOFF.  */
+   32 bit ABI.  This has no meaning for ECOFF.
+   Note that the default is always 32 bit, even if "configured" for
+   64 bit [e.g. --target=mips64-elf].  */
 static int mips_64;
 
 /* The default target format to use.  */
@@ -804,7 +806,7 @@ md_begin ()
 	    mips_cpu = 3000;
 	}
       else if (strcmp (cpu, "r3900") == 0
-               || strcmp (cpu, "mipsr3900") == 0
+               || strcmp (cpu, "mipstx39") == 0
                /* start-sanitize-tx19 */
                || strcmp (cpu, "r1900") == 0
                || strcmp (cpu, "mipstx19") == 0
@@ -6618,7 +6620,8 @@ mips_ip (str, ip)
 	      ++insn;
 	      continue;
 	    }
-	  if (insn_isa <= mips_opts.isa)
+	  if (insn_isa == 15 
+              || insn_isa <= mips_opts.isa)
 	    insn_error = "opcode not supported on this processor";
 	  else
 	    {