tc-xgate.c: Replace R_XGATE_PCREL_X with BFD_RELOC_XGATE_PCREL_X

Replace R_XGATE_PCREL_X with BFD_RELOC_XGATE_PCREL_X to silence GCC 10
warning:

gas/config/tc-xgate.c:1339:5: error: implicit conversion from ‘enum elf_xgate_reloc_type’ to ‘bfd_reloc_code_real_type’ {aka ‘enum bfd_reloc_code_real’} [-Werror=enum-conversion]
 1339 |     R_XGATE_PCREL_9);
      |     ^~~~~~~~~~~~~~~

	PR gas/26044
	* config/tc-xgate.c (md_apply_fix): Check BFD_RELOC_XGATE_PCREL_X
	instead of R_XGATE_PCREL_X.
	(xgate_parse_operand): Replace R_XGATE_PCREL_X with
	BFD_RELOC_XGATE_PCREL_X.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 55e8ac036560c868dcc4bec176d65c9afba0ec84..c6c8fd16e7bb5e27d260d094fc5bac10999c7d1f 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2020-05-26  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR gas/26044
+       * config/tc-xgate.c (md_apply_fix): Check BFD_RELOC_XGATE_PCREL_X
+       instead of R_XGATE_PCREL_X.
+       (xgate_parse_operand): Replace R_XGATE_PCREL_X with
+       BFD_RELOC_XGATE_PCREL_X.
+
 2020-05-26  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR gas/26044

diff --git a/gas/config/tc-xgate.c b/gas/config/tc-xgate.c
index afdf0dd91fa3bab860aead0a4035e9430416c204..488ee4c39bbbb815760120885a6f360e2fb8ea0a 100644 (file)
--- a/gas/config/tc-xgate.c
+++ b/gas/config/tc-xgate.c
@@ -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."),