From: Alexandre Oliva <aoliva@redhat.com>
Date: Tue, 19 Mar 2002 05:44:50 +0000 (+0000)
Subject: * config/tc-mips.c (md_estimate_size_before_relax): Do not modify
X-Git-Tag: binutils-2_12_1~94
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd8ca99fafb2fbc4dee83034fec176db9a5ecd92;p=thirdparty%2Fbinutils-gdb.git

* config/tc-mips.c (md_estimate_size_before_relax): Do not modify
the EXTENDED bit here; report the estimate according to the
current size.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5765fe8f33c..97cc604374b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-19  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config/tc-mips.c (md_estimate_size_before_relax): Do not modify
+	the EXTENDED bit here; report the estimate according to the
+	current size.
+
 2002-03-17  Hans-Peter Nilsson  <hp@bitrange.com>
 
 	* config/tc-mmix.c (md_estimate_size_before_relax): Don't consider
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index b3acb5c1837..399373cad07 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -12153,18 +12153,9 @@ md_estimate_size_before_relax (fragp, segtype)
   boolean linkonce = false;
 
   if (RELAX_MIPS16_P (fragp->fr_subtype))
-    {
-      if (mips16_extended_frag (fragp, segtype, 0))
-	{
-	  fragp->fr_subtype = RELAX_MIPS16_MARK_EXTENDED (fragp->fr_subtype);
-	  return 4;
-	}
-      else
-	{
-	  fragp->fr_subtype = RELAX_MIPS16_CLEAR_EXTENDED (fragp->fr_subtype);
-	  return 2;
-	}
-    }
+    /* We don't want to modify the EXTENDED bit here; it might get us
+       into infinite loops.  We change it only in mips_relax_frag().  */
+    return (RELAX_MIPS16_EXTENDED (fragp->fr_subtype) ? 4 : 2);
 
   if (mips_pic == NO_PIC)
     {