From: Chris Demetriou <cgd@google.com>
Date: Wed, 24 Apr 2002 21:52:47 +0000 (+0000)
Subject: 2002-04-24  Chris G. Demetriou  <cgd@broadcom.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=af55c2e6c3b2479292a76224a93f0504ceaacf55;p=binutils-gdb.git

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

        * config/tc-mips.c (macro_build): Do _not_ allow MIPS-3D
        instructions to be generated by macros.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0bc6cd2ae5b..4940d129702 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-24  Chris G. Demetriou  <cgd@broadcom.com>
+
+	* config/tc-mips.c (macro_build): Do _not_ allow MIPS-3D
+	instructions to be generated by macros.
+
 2002-04-24  Andreas Schwab  <schwab@suse.de>
 
 	* config/tc-i386.c (output_jump, output_disp)
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index eaf5552bb98..520aff1b22f 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -2913,12 +2913,11 @@ macro_build (place, counter, ep, name, fmt, va_alist)
   /* Search until we get a match for NAME.  */
   while (1)
     {
+      /* It is assumed here that macros will never generate 
+         MIPS-3D instructions.  */
       if (strcmp (fmt, insn.insn_mo->args) == 0
 	  && insn.insn_mo->pinfo != INSN_MACRO
-	  && OPCODE_IS_MEMBER (insn.insn_mo,
-			       (mips_opts.isa
-	      		        | (mips_opts.ase_mips3d ? INSN_MIPS3D : 0)),
-			       mips_arch)
+	  && OPCODE_IS_MEMBER (insn.insn_mo, mips_opts.isa, mips_arch)
 	  && (mips_arch != CPU_R4650 || (insn.insn_mo->pinfo & FP_D) == 0))
 	break;