gdb: Make infrun.c:resume function static

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

diff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c
index 816c796..91b780f 100644 (file)
--- a/bfd/elf32-or1k.c
+++ b/bfd/elf32-or1k.c
@@ -701,7 +701,7 @@ or1k_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
 
 /* Set the howto pointer for an Or1k ELF reloc.  */
 
-static void
+static bfd_boolean
 or1k_info_to_howto_rela (bfd * abfd,
                         arelent * cache_ptr,
                         Elf_Internal_Rela * dst)
@@ -714,9 +714,11 @@ or1k_info_to_howto_rela (bfd * abfd,
       /* xgettext:c-format */
       _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
                          abfd, r_type);
-      r_type = 0;
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
     }
   cache_ptr->howto = & or1k_elf_howto_table[r_type];
+  return TRUE;
 }
 
 
@@ -963,7 +965,8 @@ or1k_elf_relocate_section (bfd *output_bfd,
          /* Addend should be zero.  */
          if (rel->r_addend != 0)
            _bfd_error_handler
-             (_("internal error: addend should be zero for R_OR1K_GOT16"));
+             (_("internal error: addend should be zero for %s"),
+              "R_OR1K_GOT16");
 
          break;
 
@@ -2639,7 +2642,8 @@ elf32_or1k_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
   if ((in_flags & EF_OR1K_NODELAY) != (out_flags & EF_OR1K_NODELAY))
     {
       _bfd_error_handler
-       (_("%pB: EF_OR1K_NODELAY flag mismatch with previous modules"), ibfd);
+       (_("%pB: %s flag mismatch with previous modules"),
+        ibfd, "EF_OR1K_NODELAY");
 
       bfd_set_error (bfd_error_bad_value);
       return FALSE;