Correct opcode generated for RX indirect MOVs without an offset.

[deliverable/binutils-gdb.git] / gas / config / tc-m68k.c

diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index acfe3499d886bf333e88e09a94ba763a38bea911..6bff4fb1884c52a10211078b741a345ff9d298f7 100644 (file)
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -1,5 +1,5 @@
 /* tc-m68k.c -- Assemble for the m68k family
-   Copyright (C) 1987-2015 Free Software Foundation, Inc.
+   Copyright (C) 1987-2016 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -5703,7 +5703,7 @@ mri_chip (void)
   int i;
 
   s = input_line_pointer;
-  /* We can't use get_symbol_end since the processor names are not proper
+  /* We can't use get_symbol_name since the processor names are not proper
      symbols.  */
   while (is_part_of_name (c = *input_line_pointer++))
     ;
@@ -5731,7 +5731,7 @@ mri_chip (void)
     {
       ++input_line_pointer;
       s = input_line_pointer;
-      /* We can't use get_symbol_end since the processor names are not
+      /* We can't use get_symbol_name since the processor names are not
         proper symbols.  */
       while (is_part_of_name (c = *input_line_pointer++))
        ;
@@ -5896,8 +5896,7 @@ s_opt (int ignore ATTRIBUTE_UNUSED)
          t = 0;
        }
 
-      s = input_line_pointer;
-      c = get_symbol_end ();
+      c = get_symbol_name (&s);
 
       for (i = 0, o = opt_table; i < OPTCOUNT; i++, o++)
        {
@@ -5907,14 +5906,14 @@ s_opt (int ignore ATTRIBUTE_UNUSED)
                {
                  /* Restore input_line_pointer now in case the option
                     takes arguments.  */
-                 *input_line_pointer = c;
+                 (void) restore_line_pointer (c);
                  (*o->pfn) (o->arg, t);
                }
              else if (o->pvar != NULL)
                {
                  if (! t && o->arg == o->notarg)
                    as_bad (_("option `%s' may not be negated"), s);
-                 *input_line_pointer = c;
+                 restore_line_pointer (c);
                  *o->pvar = t ? o->arg : o->notarg;
                }
              else
@@ -5925,7 +5924,7 @@ s_opt (int ignore ATTRIBUTE_UNUSED)
       if (i >= OPTCOUNT)
        {
          as_bad (_("option `%s' not recognized"), s);
-         *input_line_pointer = c;
+         restore_line_pointer (c);
        }
     }
   while (*input_line_pointer++ == ',');
@@ -7889,7 +7888,7 @@ md_section_align (segT segment ATTRIBUTE_UNUSED, valueT size)
   int align;
 
   align = bfd_get_section_alignment (stdoutput, segment);
-  size = ((size + (1 << align) - 1) & ((valueT) -1 << align));
+  size = ((size + (1 << align) - 1) & (-((valueT) 1 << align)));
 #endif
 
   return size;