Use %A and %B in more error messages

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

diff --git a/bfd/elf32-sh64.c b/bfd/elf32-sh64.c
index 47ca44d0b132adde69e4f6fe32c27f81fc17af0c..de7ce95d0349d8941453ef9bead2483b175a542f 100644 (file)
--- a/bfd/elf32-sh64.c
+++ b/bfd/elf32-sh64.c
@@ -222,17 +222,16 @@ sh64_elf_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 = _("%s: compiled as 32-bit object and %s is 64-bit");
+       msg = _("%B: compiled as 32-bit object and %B is 64-bit");
       else if (bfd_get_arch_size (ibfd) == 64
               && bfd_get_arch_size (obfd) == 32)
        /* xgettext:c-format */
-       msg = _("%s: compiled as 64-bit object and %s is 32-bit");
+       msg = _("%B: compiled as 64-bit object and %B is 32-bit");
       else
        /* xgettext:c-format */
-       msg = _("%s: object size does not match that of target %s");
+       msg = _("%B: object size does not match that of target %B");
 
-      _bfd_error_handler (msg, bfd_get_filename (ibfd),
-                         bfd_get_filename (obfd));
+      _bfd_error_handler (msg, ibfd, obfd);
       bfd_set_error (bfd_error_wrong_format);
       return FALSE;
     }
@@ -249,8 +248,9 @@ sh64_elf_merge_private_data (bfd *ibfd, struct bfd_link_info *info)
   else if ((new_flags & EF_SH_MACH_MASK) != EF_SH5)
     {
       _bfd_error_handler
-       ("%s: uses non-SH64 instructions while previous modules use SH64 instructions",
-        bfd_get_filename (ibfd));
+       ("%B: uses non-SH64 instructions while previous modules"
+        " use SH64 instructions",
+        ibfd);
       bfd_set_error (bfd_error_bad_value);
       return FALSE;
     }
@@ -452,8 +452,7 @@ sh64_elf_add_symbol_hook (bfd *abfd, struct bfd_link_info *info,
        {
          /* Make sure we don't get confused on invalid input.  */
          _bfd_error_handler
-           (_("%s: encountered datalabel symbol in input"),
-            bfd_get_filename (abfd));
+           (_("%B: encountered datalabel symbol in input"), abfd);
          bfd_set_error (bfd_error_bad_value);
          return FALSE;
        }
@@ -548,8 +547,8 @@ shmedia_prepare_reloc (struct bfd_link_info *info, bfd *abfd,
            if ((insn & SHMEDIA_PTB_BIT) != 0)
              {
                _bfd_error_handler
-                 (_("%s: GAS error: unexpected PTB insn with R_SH_PT_16"),
-                  bfd_get_filename (input_section->owner));
+                 (_("%B: GAS error: unexpected PTB insn with R_SH_PT_16"),
+                  input_section->owner);
                return FALSE;
              }
 
@@ -674,8 +673,7 @@ sh64_elf_final_write_processing (bfd *abfd,
        {
          bfd_set_error (bfd_error_file_truncated);
          _bfd_error_handler
-           (_("%s: could not write out added .cranges entries"),
-            bfd_get_filename (abfd));
+           (_("%B: could not write out added .cranges entries"), abfd);
        }
     }
 
@@ -734,8 +732,7 @@ sh64_elf_final_write_processing (bfd *abfd,
            {
              bfd_set_error (bfd_error_file_truncated);
              _bfd_error_handler
-               (_("%s: could not write out sorted .cranges entries"),
-                bfd_get_filename (abfd));
+               (_("%B: could not write out sorted .cranges entries"), abfd);
            }
        }
     }