unrecognized/unsupported reloc message

[external/binutils.git] / bfd / elf32-m68k.c

diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 9fe886f..95db3a0 100644 (file)
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -1,5 +1,5 @@
 /* Motorola 68k series support for 32-bit ELF
-   Copyright (C) 1993-2017 Free Software Foundation, Inc.
+   Copyright (C) 1993-2018 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -349,8 +349,8 @@ rtype_to_howto (bfd *abfd, arelent *cache_ptr, Elf_Internal_Rela *dst)
   if (indx >= (unsigned int) R_68K_max)
     {
       /* xgettext:c-format */
-      _bfd_error_handler (_("%B: invalid relocation type %d"),
-                         abfd, (int) indx);
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+                         abfd, indx);
       indx = R_68K_NONE;
     }
   cache_ptr->howto = &howto_table[indx];
@@ -1655,14 +1655,14 @@ elf_m68k_add_entry_to_got (struct elf_m68k_got *got,
     {
       if (got->n_slots[R_8] > ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info))
        /* xgettext:c-format */
-       _bfd_error_handler (_("%B: GOT overflow: "
+       _bfd_error_handler (_("%pB: GOT overflow: "
                              "Number of relocations with 8-bit "
                              "offset > %d"),
                            abfd,
                            ELF_M68K_R_8_MAX_N_SLOTS_IN_GOT (info));
       else
        /* xgettext:c-format */
-       _bfd_error_handler (_("%B: GOT overflow: "
+       _bfd_error_handler (_("%pB: GOT overflow: "
                              "Number of relocations with 8- or 16-bit "
                              "offset > %d"),
                            abfd,
@@ -3698,8 +3698,10 @@ elf_m68k_relocate_section (bfd *output_bfd,
            {
              _bfd_error_handler
                /* xgettext:c-format */
-               (_("%B(%A+%#Lx): %s relocation not permitted in shared object"),
-                input_bfd, input_section, rel->r_offset, howto->name);
+               (_("%pB(%pA+%#" PRIx64 "): "
+                  "%s relocation not permitted in shared object"),
+                input_bfd, input_section, (uint64_t) rel->r_offset,
+                howto->name);
 
              return FALSE;
            }
@@ -3892,10 +3894,11 @@ elf_m68k_relocate_section (bfd *output_bfd,
        {
          _bfd_error_handler
            /* xgettext:c-format */
-           (_("%B(%A+%#Lx): unresolvable %s relocation against symbol `%s'"),
+           (_("%pB(%pA+%#" PRIx64 "): "
+              "unresolvable %s relocation against symbol `%s'"),
             input_bfd,
             input_section,
-            rel->r_offset,
+            (uint64_t) rel->r_offset,
             howto->name,
             h->root.root.string);
          return FALSE;
@@ -3928,12 +3931,12 @@ elf_m68k_relocate_section (bfd *output_bfd,
              _bfd_error_handler
                ((sym_type == STT_TLS
                  /* xgettext:c-format */
-                 ? _("%B(%A+%#Lx): %s used with TLS symbol %s")
+                 ? _("%pB(%pA+%#" PRIx64 "): %s used with TLS symbol %s")
                  /* xgettext:c-format */
-                 : _("%B(%A+%#Lx): %s used with non-TLS symbol %s")),
+                 : _("%pB(%pA+%#" PRIx64 "): %s used with non-TLS symbol %s")),
                 input_bfd,
                 input_section,
-                rel->r_offset,
+                (uint64_t) rel->r_offset,
                 howto->name,
                 name);
            }
@@ -3968,9 +3971,9 @@ elf_m68k_relocate_section (bfd *output_bfd,
            {
              _bfd_error_handler
                /* xgettext:c-format */
-               (_("%B(%A+%#Lx): reloc against `%s': error %d"),
+               (_("%pB(%pA+%#" PRIx64 "): reloc against `%s': error %d"),
                 input_bfd, input_section,
-                rel->r_offset, name, (int) r);
+                (uint64_t) rel->r_offset, name, (int) r);
              return FALSE;
            }
        }
@@ -4382,7 +4385,7 @@ bfd_m68k_elf32_create_embedded_relocs (bfd *abfd, struct bfd_link_info *info,
       /* We can only relocate absolute longword relocs at run time.  */
       if (ELF32_R_TYPE (irel->r_info) != (int) R_68K_32)
        {
-         *errmsg = _("unsupported reloc type");
+         *errmsg = _("unsupported relocation type");
          bfd_set_error (bfd_error_bad_value);
          goto error_return;
        }