daily update

[external/binutils.git] / gas / expr.c

diff --git a/gas/expr.c b/gas/expr.c
index 094141f..4517bc6 100644 (file)
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -1587,13 +1587,13 @@ operatorf (int *num_chars)
   if (is_name_beginner (c))
     {
       char *name = input_line_pointer;
-      char c = get_symbol_end ();
+      char ec = get_symbol_end ();
 
-      ret = md_operator (name, 2, &c);
+      ret = md_operator (name, 2, &ec);
       switch (ret)
        {
        case O_absent:
-         *input_line_pointer = c;
+         *input_line_pointer = ec;
          input_line_pointer = name;
          break;
        case O_uminus:
@@ -1603,7 +1603,7 @@ operatorf (int *num_chars)
          ret = O_illegal;
          /* FALLTHROUGH */
        default:
-         *input_line_pointer = c;
+         *input_line_pointer = ec;
          *num_chars = input_line_pointer - name;
          input_line_pointer = name;
          return ret;
@@ -1740,6 +1740,7 @@ expr (int rankarg,                /* Larger # is higher rank.  */
 
       input_line_pointer += op_chars;  /* -> after operator.  */
 
+      right.X_md = 0;
       rightseg = expr (op_rank[(int) op_left], &right, mode);
       if (right.X_op == O_absent)
        {
@@ -2237,8 +2238,7 @@ resolve_expression (expressionS *expressionP)
        op = O_constant;
       else if (seg_left == reg_section && final_val == 0)
        op = O_register;
-      else if (seg_left == undefined_section
-              && add_symbol != orig_add_symbol)
+      else if (!symbol_same_p (add_symbol, orig_add_symbol))
        final_val += left;
       expressionP->X_add_symbol = add_symbol;
     }