PR gas/10856

	* expr.c (resolve_expression): Only add "left" value to O_symbol
	expression when the symbol is undefined and different from the
	original symbol.  Simplify negative logic.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0f9b806899d0f2da324367dfb4817770e39a0f31..61ea74082f6a4f5e34a9d431dd22ef6e49f4ce89 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2009-10-28  Alan Modra  <amodra@bigpond.net.au>
+
+       PR gas/10856
+       * expr.c (resolve_expression): Only add "left" value to O_symbol
+       expression when the symbol is undefined and different from the
+       original symbol.  Simplify negative logic.
+
 2009-10-18  Matthias Klose  <doko@ubuntu.com>
 
        * config/tc-arm.c (make_mapping_symbol): Add braces to avoid empty body

diff --git a/gas/expr.c b/gas/expr.c
index b9ce5741981d7a0a41f2b91621ed58d77c90a3da..094141f6e3bbf2cfacf841f9bacef4074c1d538f 100644 (file)
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -1997,6 +1997,7 @@ resolve_expression (expressionS *expressionP)
   /* Help out with CSE.  */
   valueT final_val = expressionP->X_add_number;
   symbolS *add_symbol = expressionP->X_add_symbol;
+  symbolS *orig_add_symbol = add_symbol;
   symbolS *op_symbol = expressionP->X_op_symbol;
   operatorT op = expressionP->X_op;
   valueT left, right;
@@ -2078,6 +2079,7 @@ resolve_expression (expressionS *expressionP)
              left = right;
              seg_left = seg_right;
              add_symbol = op_symbol;
+             orig_add_symbol = expressionP->X_op_symbol;
              op = O_symbol;
              break;
            }
@@ -2122,18 +2124,19 @@ resolve_expression (expressionS *expressionP)
            {
              if (op == O_bit_exclusive_or || op == O_bit_inclusive_or)
                {
-                 if (seg_right != absolute_section || right != 0)
+                 if (!(seg_right == absolute_section && right == 0))
                    {
                      seg_left = seg_right;
                      left = right;
                      add_symbol = op_symbol;
+                     orig_add_symbol = expressionP->X_op_symbol;
                    }
                  op = O_symbol;
                  break;
                }
              else if (op == O_left_shift || op == O_right_shift)
                {
-                 if (seg_left != absolute_section || left != 0)
+                 if (!(seg_left == absolute_section && left == 0))
                    {
                      op = O_symbol;
                      break;
@@ -2149,6 +2152,7 @@ resolve_expression (expressionS *expressionP)
              seg_left = seg_right;
              left = right;
              add_symbol = op_symbol;
+             orig_add_symbol = expressionP->X_op_symbol;
              op = O_symbol;
              break;
            }
@@ -2158,11 +2162,11 @@ resolve_expression (expressionS *expressionP)
              op = O_symbol;
              break;
            }
-         else if (left != right
-                  || ((seg_left != reg_section || seg_right != reg_section)
-                      && (seg_left != undefined_section
-                          || seg_right != undefined_section
-                          || add_symbol != op_symbol)))
+         else if (!(left == right
+                    && ((seg_left == reg_section && seg_right == reg_section)
+                        || (seg_left == undefined_section
+                            && seg_right == undefined_section
+                            && add_symbol == op_symbol))))
            return 0;
          else if (op == O_bit_and || op == O_bit_inclusive_or)
            {
@@ -2233,7 +2237,8 @@ resolve_expression (expressionS *expressionP)
        op = O_constant;
       else if (seg_left == reg_section && final_val == 0)
        op = O_register;
-      else if (add_symbol != expressionP->X_add_symbol)
+      else if (seg_left == undefined_section
+              && add_symbol != orig_add_symbol)
        final_val += left;
       expressionP->X_add_symbol = add_symbol;
     }