Regenerate configure

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

diff --git a/gas/config/tc-sh64.c b/gas/config/tc-sh64.c
index 47248fb9d2ce2da320dac993eb5fc544829bb310..eb1c287478f3249d8d1ea5f734106fd98bdecb66 100644 (file)
--- a/gas/config/tc-sh64.c
+++ b/gas/config/tc-sh64.c
@@ -1,12 +1,11 @@
 /* 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
-   Free Software Foundation.
+   Copyright (C) 2000-2016 Free Software Foundation, Inc.

 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -2021,7 +2020,7 @@ shmedia_md_estimate_size_before_relax (fragS *fragP,
          offsetT value = fragP->fr_offset
            + (fragP->fr_symbol == NULL ? 0 : S_GET_VALUE (fragP->fr_symbol));
 
          offsetT value = fragP->fr_offset
            + (fragP->fr_symbol == NULL ? 0 : S_GET_VALUE (fragP->fr_symbol));
 

-         if (value >= ((offsetT) -1 << 15) && value < ((offsetT) 1 << 15))
+         if (value >= (-((offsetT) 1 << 15)) && value < ((offsetT) 1 << 15))

            {
              /* Fits in 16-bit signed number.  */
              int what = GET_WHAT (fragP->fr_subtype);
            {
              /* Fits in 16-bit signed number.  */
              int what = GET_WHAT (fragP->fr_subtype);


@@ -2204,16 +2203,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 +2677,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 +2717,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;
              }
 


@@ -3035,8 +3034,6 @@ sh64_target_mach (void)
 valueT
 shmedia_md_pcrel_from_section (struct fix *fixP, segT sec ATTRIBUTE_UNUSED)
 {
 valueT
 shmedia_md_pcrel_from_section (struct fix *fixP, segT sec ATTRIBUTE_UNUSED)
 {

-  know (fixP->fx_frag->fr_type == rs_machine_dependent);
-

   /* Use the ISA for the instruction to decide which offset to use.  We
      can glean it from the fisup type.  */
   switch (fixP->fx_r_type)
   /* Use the ISA for the instruction to decide which offset to use.  We
      can glean it from the fisup type.  */
   switch (fixP->fx_r_type)


@@ -3066,8 +3063,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.  */


@@ -3276,9 +3272,9 @@ sh64_consume_datalabel (const char *name, expressionS *exp,
          else
            {
              symbolS *dl_symp;
          else
            {
              symbolS *dl_symp;

-             const char *name = S_GET_NAME (symp);
+             const char * sname = S_GET_NAME (symp);

              char *dl_name
              char *dl_name

-               = xmalloc (strlen (name) + sizeof (DATALABEL_SUFFIX));
+               = xmalloc (strlen (sname) + sizeof (DATALABEL_SUFFIX));

 
              /* Now we copy the datalabel-qualified symbol into a symbol
                 with the same name, but with " DL" appended.  We mark the
 
              /* Now we copy the datalabel-qualified symbol into a symbol
                 with the same name, but with " DL" appended.  We mark the


@@ -3286,13 +3282,13 @@ sh64_consume_datalabel (const char *name, expressionS *exp,
                 the main symbol, so we don't have to inspect all symbol
                 names.  Note that use of "datalabel" is not expected to
                 be a common case.  */
                 the main symbol, so we don't have to inspect all symbol
                 names.  Note that use of "datalabel" is not expected to
                 be a common case.  */

-             strcpy (dl_name, name);
+             strcpy (dl_name, sname);

              strcat (dl_name, DATALABEL_SUFFIX);
 
              /* A FAKE_LABEL_NAME marks "$" or ".".  There can be any
                 number of them and all have the same (faked) name; we
                 must make a new one each time.  */
              strcat (dl_name, DATALABEL_SUFFIX);
 
              /* A FAKE_LABEL_NAME marks "$" or ".".  There can be any
                 number of them and all have the same (faked) name; we
                 must make a new one each time.  */

-             if (strcmp (name, FAKE_LABEL_NAME) == 0)
+             if (strcmp (sname, FAKE_LABEL_NAME) == 0)

                dl_symp = symbol_make (dl_name);
              else
                dl_symp = symbol_find_or_make (dl_name);
                dl_symp = symbol_make (dl_name);
              else
                dl_symp = symbol_find_or_make (dl_name);