* 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 f6331af..b918360 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-18  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-18  Tom Rix  <trix@redhat.com>
 
        * configure.in: Add AIX 5 support.

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 54d24be..8cc0a82 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -12193,18 +12193,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)
     {