Fix tight loop on recursively-defined symbols

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

diff --git a/gas/symbols.c b/gas/symbols.c
index 79cdb82ba8c09f81f2493d99da1932b1b51c1101..711730daf1c644b4b5647a5a236406bb1aae272f 100644 (file)
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -114,7 +114,7 @@ struct symbol
 /* A pointer in the symbol may point to either a complete symbol
    (struct symbol above) or to a local symbol (struct local_symbol
    defined here).  The symbol code can detect the case by examining
-   the first field.  It is always NULL for a local symbol.
+   the first field which is present in both structs.
 
    We do this because we ordinarily only need a small amount of
    information for a local symbol.  The symbol table takes up a lot of
@@ -1237,11 +1237,18 @@ resolve_symbol_value (symbolS *symp)
   if (symp->sy_flags.sy_resolved)
     {
       final_val = 0;
-      while (symp->sy_value.X_op == O_symbol
-            && symp->sy_value.X_add_symbol->sy_flags.sy_resolved)
+      while (symp->sy_value.X_op == O_symbol)
        {
          final_val += symp->sy_value.X_add_number;
          symp = symp->sy_value.X_add_symbol;
+         if (LOCAL_SYMBOL_CHECK (symp))
+           {
+             struct local_symbol *locsym = (struct local_symbol *) symp;
+             final_val += locsym->lsy_value;
+             return final_val;
+           }
+         if (!symp->sy_flags.sy_resolved)
+           return 0;
        }
       if (symp->sy_value.X_op == O_constant)
        final_val += symp->sy_value.X_add_number;
@@ -1380,6 +1387,11 @@ resolve_symbol_value (symbolS *symp)
              break;
            }
 
+         /* Don't leave symbol loops.  */
+         if (finalize_syms
+             && add_symbol->sy_flags.sy_resolving)
+           break;
+
          if (finalize_syms && final_val == 0)
            {
              if (LOCAL_SYMBOL_CHECK (add_symbol))
@@ -1638,7 +1650,7 @@ resolve_symbol_value (symbolS *symp)
   if (finalize_syms)
     S_SET_VALUE (symp, final_val);
 
-exit_dont_set_value:
+ exit_dont_set_value:
   /* Always set the segment, even if not finalizing the value.
      The segment is used to determine whether a symbol is defined.  */
     S_SET_SEGMENT (symp, final_seg);