Automatic date update in version.in

[deliverable/binutils-gdb.git] / bfd / elf64-sh64.c

diff --git a/bfd/elf64-sh64.c b/bfd/elf64-sh64.c
index 8a41764ffe31a0695ee2608b99690ab49bca45fe..5c8c2e809a7de922afdea1f78aa4fa1681fc6b49 100644 (file)
--- a/bfd/elf64-sh64.c
+++ b/bfd/elf64-sh64.c
@@ -1536,9 +1536,10 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
                {
                  _bfd_error_handler
                    /* xgettext:c-format */
-                   (_("%B(%A+%#Lx): %s relocation against SEC_MERGE section"),
+                   (_("%pB(%pA+%#" PRIx64 "): "
+                      "%s relocation against SEC_MERGE section"),
                     input_bfd, input_section,
-                    rel->r_offset, howto->name);
+                    (uint64_t) rel->r_offset, howto->name);
                  return FALSE;
                }
 
@@ -1633,10 +1634,11 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
                {
                  _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);
                }
@@ -1677,9 +1679,10 @@ sh_elf64_relocate_section (bfd *output_bfd ATTRIBUTE_UNUSED,
        {
          _bfd_error_handler
            /* xgettext:c-format */
-           (_("%B: error: unaligned relocation type %d at %08Lx reloc %08Lx"),
-            input_bfd, (int) r_type, rel->r_offset,
-            relocation);
+           (_("%pB: error: unaligned relocation type %d at "
+              "%08" PRIx64 " reloc %08" PRIx64 ""),
+            input_bfd, (int) r_type,
+            (uint64_t) rel->r_offset, (uint64_t) relocation);
          bfd_set_error (bfd_error_bad_value);
          return FALSE;
        }
@@ -2274,14 +2277,14 @@ sh_elf64_merge_private_data (bfd *ibfd, struct bfd_link_info *info)
       if (bfd_get_arch_size (ibfd) == 32
          && bfd_get_arch_size (obfd) == 64)
        /* xgettext:c-format */
-       msg = _("%B: compiled as 32-bit object and %B is 64-bit");
+       msg = _("%pB: compiled as 32-bit object and %pB is 64-bit");
       else if (bfd_get_arch_size (ibfd) == 64
               && bfd_get_arch_size (obfd) == 32)
        /* xgettext:c-format */
-       msg = _("%B: compiled as 64-bit object and %B is 32-bit");
+       msg = _("%pB: compiled as 64-bit object and %pB is 32-bit");
       else
        /* xgettext:c-format */
-       msg = _("%B: object size does not match that of target %B");
+       msg = _("%pB: object size does not match that of target %pB");
 
       _bfd_error_handler (msg, ibfd, obfd);
       bfd_set_error (bfd_error_wrong_format);
@@ -2302,7 +2305,7 @@ sh_elf64_merge_private_data (bfd *ibfd, struct bfd_link_info *info)
   else if ((new_flags & EF_SH_MACH_MASK) != EF_SH5)
     {
       _bfd_error_handler
-       ("%B: does not use the SH64 64-bit ABI as previous modules do", ibfd);
+       ("%pB: does not use the SH64 64-bit ABI as previous modules do", ibfd);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
@@ -2769,7 +2772,7 @@ sh64_elf64_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
        {
          /* Make sure we don't get confused on invalid input.  */
          _bfd_error_handler
-           (_("%B: encountered datalabel symbol in input"), abfd);
+           (_("%pB: encountered datalabel symbol in input"), abfd);
          bfd_set_error (bfd_error_bad_value);
          return FALSE;
        }
@@ -3926,8 +3929,7 @@ static const struct bfd_elf_special_section sh64_elf64_special_sections[]=
                                        sh64_elf64_adjust_dynamic_symbol
 #define elf_backend_size_dynamic_sections \
                                        sh64_elf64_size_dynamic_sections
-#define elf_backend_omit_section_dynsym \
-  ((bfd_boolean (*) (bfd *, struct bfd_link_info *, asection *)) bfd_true)
+#define elf_backend_omit_section_dynsym _bfd_elf_omit_section_dynsym_all
 #define elf_backend_finish_dynamic_symbol \
                                        sh64_elf64_finish_dynamic_symbol
 #define elf_backend_finish_dynamic_sections \