Use macros for TUI window names

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

diff --git a/gas/config/tc-xgate.c b/gas/config/tc-xgate.c
index af5a086156dfd29921987c0376d6e8393f82056f..488ee4c39bbbb815760120885a6f360e2fb8ea0a 100644 (file)
--- a/gas/config/tc-xgate.c
+++ b/gas/config/tc-xgate.c
@@ -1,5 +1,5 @@
 /* tc-xgate.c -- Assembler code for Freescale XGATE
-   Copyright (C) 2010-2017 Free Software Foundation, Inc.
+   Copyright (C) 2010-2020 Free Software Foundation, Inc.
    Contributed by Sean Keys <skeys@ipdatasys.com>
 
    This file is part of GAS, the GNU Assembler.
@@ -212,7 +212,7 @@ md_parse_option (int c, const char *arg)
       else if (strcasecmp (arg, "v3") == 0)
        current_architecture = XGATE_V3;
       else
-       as_bad (_(" architecture variant invalid"));
+       as_bad (_("architecture variant invalid"));
       break;
 
     case OPTION_PRINT_INSN_SYNTAX:
@@ -373,7 +373,7 @@ Freescale XGATE co-processor options:\n\
   -mlong                  use 32-bit int ABI\n\
   -mshort-double          use 32-bit double ABI\n\
   -mlong-double           use 64-bit double ABI (default)\n\
-  --mxgate                specify the processor variant[default %s]\n\
+  --mxgate                specify the processor variant [default %s]\n\
   --print-insn-syntax     print the syntax of instruction in case of error\n\
   --print-opcodes         print the list of instructions with syntax\n\
   --generate-example      generate an example of each instruction"),
@@ -466,7 +466,7 @@ md_undefined_symbol (char *name ATTRIBUTE_UNUSED)
 valueT
 md_section_align (asection * seg, valueT addr)
 {
-  int align = bfd_get_section_alignment (stdoutput, seg);
+  int align = bfd_section_alignment (seg);
   return ((addr + (1 << align) - 1) & -(1 << align));
 }
 
@@ -508,7 +508,7 @@ md_assemble (char *input_line)
 
       if (!opcode)
        {
-         as_bad (_("matching operands to opcode "));
+         as_bad (_("matching operands to opcode"));
          xgate_print_syntax (opcode_handle->opc0[0]->name);
        }
       else if (opcode->size == 2)
@@ -668,7 +668,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
 
   switch (fixP->fx_r_type)
     {
-    case R_XGATE_PCREL_9:
+    case BFD_RELOC_XGATE_PCREL_9:
       if (value < -512 || value > 511)
        as_bad_where (fixP->fx_file, fixP->fx_line,
                      _("Value %ld too large for 9-bit PC-relative branch."),
@@ -685,7 +685,7 @@ md_apply_fix (fixS * fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
       value &= mask;
       number_to_chars_bigendian (where, (opcode | value), 2);
       break;
-    case R_XGATE_PCREL_10:
+    case BFD_RELOC_XGATE_PCREL_10:
       if (value < -1024 || value > 1023)
        as_bad_where (fixP->fx_file, fixP->fx_line,
                      _("Value %ld too large for 10-bit PC-relative branch."),
@@ -1336,10 +1336,10 @@ xgate_parse_operand (struct xgate_opcode *opcode,
        {
          if (*op_constraint == '9')
            fix_new_exp (frag_now, where, 2, &operand.exp, TRUE,
-                        R_XGATE_PCREL_9);
+                        BFD_RELOC_XGATE_PCREL_9);
          else if (*op_constraint == 'a')
            fix_new_exp (frag_now, where, 2, &operand.exp, TRUE,
-                        R_XGATE_PCREL_10);
+                        BFD_RELOC_XGATE_PCREL_10);
        }
       else
        as_fatal (_("Operand `%x' not recognized in fixup8."),