* config/tc-xtensa.c (insn_labels, free_insn_labels, saved_insn_labels,

[deliverable/binutils-gdb.git] / gas / ehopt.c

diff --git a/gas/ehopt.c b/gas/ehopt.c
index e556e29d1732689f5688da2c2c3395ec42818ec8..6e19ae69bf1647eb55efbf8a6cbb7724a488d445 100644 (file)
--- a/gas/ehopt.c
+++ b/gas/ehopt.c
@@ -1,5 +1,5 @@
 /* ehopt.c--optimize gcc exception frame information.
-   Copyright 1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 2000, 2001, 2003 Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>.
 
 This file is part of GAS, the GNU Assembler.
@@ -363,6 +363,8 @@ check_eh_frame (exp, pnbytes)
        }
       else
        d->state = state_error;
+      if (d->state == state_skipping_aug && d->aug_size == 0)
+       d->state = state_wait_loc4;
       break;
 
     case state_skipping_aug:
@@ -370,7 +372,7 @@ check_eh_frame (exp, pnbytes)
        d->state = state_error;
       else
        {
-          int left = (d->aug_size -= *pnbytes);
+         int left = (d->aug_size -= *pnbytes);
          if (left == 0)
            d->state = state_wait_loc4;
          else if (left < 0)
@@ -462,7 +464,7 @@ eh_frame_estimate_size_before_relax (frag)
   int ca = frag->fr_subtype >> 3;
   int ret;
 
-  diff = resolve_symbol_value (frag->fr_symbol, 0);
+  diff = resolve_symbol_value (frag->fr_symbol);
 
   if (ca > 0 && diff % ca == 0 && diff / ca < 0x40)
     ret = 0;
@@ -508,7 +510,7 @@ eh_frame_convert_frag (frag)
   loc4_frag = (fragS *) frag->fr_opcode;
   loc4_fix = (int) frag->fr_offset;
 
-  diff = resolve_symbol_value (frag->fr_symbol, finalize_syms);
+  diff = resolve_symbol_value (frag->fr_symbol);
 
   switch (frag->fr_subtype & 7)
     {
@@ -537,7 +539,8 @@ eh_frame_convert_frag (frag)
       break;
     }
 
-  frag->fr_fix += frag->fr_subtype;
+  frag->fr_fix += frag->fr_subtype & 7;
   frag->fr_type = rs_fill;
+  frag->fr_subtype = 0;
   frag->fr_offset = 0;
 }