Merge commit 'upstream/2.20'

[msp430-binutils.git] / gas / config / tc-sh64.c

diff --git a/gas/config/tc-sh64.c b/gas/config/tc-sh64.c
index 2836ecc47ddb1a7ee72482ee49d1458f6ecda080..7610a494294d0d224831162b603b9d95daff6473 100644 (file)
--- a/gas/config/tc-sh64.c
+++ b/gas/config/tc-sh64.c
@@ -1,5 +1,5 @@
 /* tc-sh64.c -- Assemble code for the SuperH SH SHcompact and SHmedia.
 /* tc-sh64.c -- Assemble code for the SuperH SH SHcompact and SHmedia.

-   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009

    Free Software Foundation.
 
    This file is part of GAS, the GNU Assembler.
    Free Software Foundation.
 
    This file is part of GAS, the GNU Assembler.


@@ -2204,16 +2204,16 @@ static char *
 shmedia_parse_exp (char *s, shmedia_operand_info *op)
 {
   char *save;
 shmedia_parse_exp (char *s, shmedia_operand_info *op)
 {
   char *save;

-  char *new;
+  char *new_pointer;

 
   save = input_line_pointer;
   input_line_pointer = s;
   expression (&op->immediate);
   if (op->immediate.X_op == O_absent)
     as_bad (_("missing operand"));
 
   save = input_line_pointer;
   input_line_pointer = s;
   expression (&op->immediate);
   if (op->immediate.X_op == O_absent)
     as_bad (_("missing operand"));

-  new = input_line_pointer;
+  new_pointer = input_line_pointer;

   input_line_pointer = save;
   input_line_pointer = save;

-  return new;
+  return new_pointer;

 }
 
 /* Parse an operand.  Store pointer to next character in *PTR.  */
 }
 
 /* Parse an operand.  Store pointer to next character in *PTR.  */


@@ -2678,7 +2678,7 @@ shmedia_build_Mytes (shmedia_opcode_info *opcode,
            /* Don't allow complex expressions here.  */
            if (opjp->immediate.X_op_symbol != NULL)
              {
            /* Don't allow complex expressions here.  */
            if (opjp->immediate.X_op_symbol != NULL)
              {

-               as_bad(_("invalid operand: expression in PT target"));
+               as_bad (_("invalid operand: expression in PT target"));

                return 0;
              }
 
                return 0;
              }
 


@@ -2718,7 +2718,7 @@ shmedia_build_Mytes (shmedia_opcode_info *opcode,
            /* Don't allow complex expressions here.  */
            if (opjp->immediate.X_op_symbol != NULL)
              {
            /* Don't allow complex expressions here.  */
            if (opjp->immediate.X_op_symbol != NULL)
              {

-               as_bad(_("invalid operand: expression in PT target"));
+               as_bad (_("invalid operand: expression in PT target"));

                return 0;
              }
 
                return 0;
              }
 


@@ -3064,8 +3064,7 @@ shmedia_md_pcrel_from_section (struct fix *fixP, segT sec ATTRIBUTE_UNUSED)
 
     case BFD_RELOC_64:
     case BFD_RELOC_64_PCREL:
 
     case BFD_RELOC_64:
     case BFD_RELOC_64_PCREL:

-      know (0 /* Shouldn't get here.  */);
-      break;
+      /* Fall through.  */

 
     default:
       /* If section was SHcompact, use its function.  */
 
     default:
       /* If section was SHcompact, use its function.  */