Merge branch 'master' into merge-job

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

diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c
index 0ca6dd1c1bb8feb0c4b8efeaa68a501e2b1f3a12..b7e3464c6f1e43293db7a728d5e57ce97ddff03a 100644 (file)
--- a/bfd/elf32-rl78.c
+++ b/bfd/elf32-rl78.c
@@ -1,5 +1,5 @@
 /* Renesas RL78 specific support for 32-bit ELF.
-   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+   Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
 
@@ -20,7 +20,6 @@
 
 #include "sysdep.h"
 #include "bfd.h"
-#include "bfd_stdint.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/rl78.h"
@@ -278,8 +277,8 @@ rl78_reloc_name_lookup (bfd * abfd ATTRIBUTE_UNUSED, const char * r_name)
 
 /* Set the howto pointer for an RL78 ELF reloc.  */
 
-static void
-rl78_info_to_howto_rela (bfd *              abfd ATTRIBUTE_UNUSED,
+static bfd_boolean
+rl78_info_to_howto_rela (bfd *              abfd,
                         arelent *           cache_ptr,
                         Elf_Internal_Rela * dst)
 {
@@ -291,9 +290,11 @@ rl78_info_to_howto_rela (bfd *                  abfd ATTRIBUTE_UNUSED,
       /* 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 = rl78_elf_howto_table + r_type;
+  return TRUE;
 }
 \f
 static bfd_vma
@@ -368,7 +369,7 @@ static unsigned int rl78_stack_top;
       if (rl78_stack_top < NUM_STACK_ENTRIES)  \
        rl78_stack [rl78_stack_top ++] = (val); \
       else                                     \
-       _bfd_error_handler (_("Internal Error: RL78 reloc stack overflow")); \
+       _bfd_error_handler (_("internal error: RL78 reloc stack overflow")); \
     }                                          \
   while (0)
 
@@ -379,7 +380,7 @@ static unsigned int rl78_stack_top;
        (dest) = rl78_stack [-- rl78_stack_top];\
       else                                     \
        {                                       \
-         _bfd_error_handler (_("Internal Error: RL78 reloc stack underflow")); \
+         _bfd_error_handler (_("internal error: RL78 reloc stack underflow")); \
          (dest) = 0;                           \
        }                                       \
     }                                          \
@@ -725,7 +726,7 @@ rl78_elf_relocate_section
 
          name = bfd_elf_string_from_elf_section
            (input_bfd, symtab_hdr->sh_link, sym->st_name);
-         name = (sym->st_name == 0) ? bfd_section_name (input_bfd, sec) : name;
+         name = sym->st_name == 0 ? bfd_section_name (sec) : name;
        }
       else
        {
@@ -1048,7 +1049,8 @@ rl78_elf_relocate_section
            {
              relocation = 0;
              if (h->root.type != bfd_link_hash_undefweak)
-               _bfd_error_handler (_("Warning: RL78_SYM reloc with an unknown symbol"));
+               _bfd_error_handler
+                 (_("warning: RL78_SYM reloc with an unknown symbol"));
            }
          (void) rl78_compute_complex_reloc (r_type, relocation, input_section);
          break;
@@ -1347,7 +1349,7 @@ rl78_elf_check_relocs
                                                         flags);
              elf_hash_table (info)->splt = splt;
              if (splt == NULL
-                 || ! bfd_set_section_alignment (dynobj, splt, 1))
+                 || !bfd_set_section_alignment (splt, 1))
                return FALSE;
            }