Fix more fallout from multi-pass relaxation patch.

[thirdparty/binutils-gdb.git] / gas / config / tc-openrisc.c

diff --git a/gas/config/tc-openrisc.c b/gas/config/tc-openrisc.c
index 2907cd48974aee3f107a56ce4419f6952da27940..1aae4b4bf8283845fd172c2a5766bff69b762d4c 100644 (file)
--- a/gas/config/tc-openrisc.c
+++ b/gas/config/tc-openrisc.c
@@ -277,8 +277,6 @@ md_estimate_size_before_relax (fragP, segment)
      fragS * fragP;
      segT    segment;
 {
-  int    old_fr_fix = fragP->fr_fix;
-
   /* The only thing we have to handle here are symbols outside of the
      current segment.  They may be undefined or in a different segment in
      which case linker scripts may place them anywhere.
@@ -316,7 +314,7 @@ md_estimate_size_before_relax (fragP, segment)
       }
     }
 
-  return (fragP->fr_var + fragP->fr_fix - old_fr_fix);
+  return md_relax_table[fragP->fr_subtype].rlx_length;
 }
 
 /* *fragP has been relaxed to its final size, and now needs to have