Eliminate make_cleanup_ui_file_delete / make ui_file a class hierarchy

[binutils-gdb.git] / bfd / elf32-mep.c

diff --git a/bfd/elf32-mep.c b/bfd/elf32-mep.c
index 0d18206b144ecb4e6d8fa766d5de8232578ac1de..491644418fdc7a07e0e6a1a7b2e20a7c48a038be 100644 (file)
--- a/bfd/elf32-mep.c
+++ b/bfd/elf32-mep.c
@@ -1,5 +1,5 @@
 /* MeP-specific support for 32-bit ELF.
-   Copyright (C) 2001-2016 Free Software Foundation, Inc.
+   Copyright (C) 2001-2017 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -136,14 +136,15 @@ mep_reloc_type_lookup
 
     default:
       /* Pacify gcc -Wall.  */
-      (*_bfd_error_handler) (_("mep: no reloc for code %d"), code);
+      _bfd_error_handler (_("mep: no reloc for code %d"), code);
       return NULL;
     }
 
   if (mep_elf_howto_table[type].type != type)
     {
-      (*_bfd_error_handler) (_("MeP: howto %d has type %d"),
-                            type, mep_elf_howto_table[type].type);
+      /* xgettext:c-format */
+      _bfd_error_handler (_("MeP: howto %d has type %d"),
+                         type, mep_elf_howto_table[type].type);
       abort ();
     }
 
@@ -385,6 +386,7 @@ mep_info_to_howto_rela
   r_type = ELF32_R_TYPE (dst->r_info);
   if (r_type >= R_MEP_max)
     {
+      /* xgettext:c-format */
       _bfd_error_handler (_("%B: invalid MEP reloc number: %d"), abfd, r_type);
       r_type = 0;
     }
@@ -568,14 +570,15 @@ mep_elf_set_private_flags (bfd *    abfd,
    object file when linking.  */
 
 static bfd_boolean
-mep_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
+mep_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 {
+  bfd *obfd = info->output_bfd;
   static bfd *last_ibfd = 0;
   flagword old_flags, new_flags;
   flagword old_partial, new_partial;
 
   /* Check if we have the same endianness.  */
-  if (_bfd_generic_verify_endian_match (ibfd, obfd) == FALSE)
+  if (!_bfd_generic_verify_endian_match (ibfd, info))
     return FALSE;
 
   new_flags = elf_elfheader (ibfd)->e_flags;
@@ -613,6 +616,7 @@ mep_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
        old_flags = (old_flags & ~EF_MEP_CPU_MASK) | new_partial;
       else
        {
+         /* xgettext:c-format */
          _bfd_error_handler (_("%B and %B are for different cores"), last_ibfd, ibfd);
          bfd_set_error (bfd_error_invalid_target);
          return FALSE;
@@ -630,6 +634,7 @@ mep_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd)
        old_flags = (old_flags & ~EF_MEP_INDEX_MASK) | new_partial;
       else
        {
+         /* xgettext:c-format */
          _bfd_error_handler (_("%B and %B are for different configurations"), last_ibfd, ibfd);
          bfd_set_error (bfd_error_invalid_target);
          return FALSE;