win32 typo fix

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

diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c
index 50d229f19e72c436621402f537dfd56857e50c10..633350faec42d7a07f3972d5f971aba6cbf7ebf9 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)
 {
@@ -289,10 +288,13 @@ rl78_info_to_howto_rela (bfd *                 abfd ATTRIBUTE_UNUSED,
   if (r_type >= (unsigned int) R_RL78_max)
     {
       /* xgettext:c-format */
-      _bfd_error_handler (_("%pB: invalid RL78 reloc number: %d"), abfd, r_type);
-      r_type = 0;
+      _bfd_error_handler (_("%pB: unsupported relocation type %#x"),
+                         abfd, r_type);
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
     }
   cache_ptr->howto = rl78_elf_howto_table + r_type;
+  return TRUE;
 }
 \f
 static bfd_vma
@@ -367,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)
 
@@ -378,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;                           \
        }                                       \
     }                                          \
@@ -724,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
        {
@@ -1047,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;
@@ -1346,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;
            }
 
@@ -1819,7 +1822,7 @@ static bfd_vma
 rl78_offset_for_reloc (bfd *                   abfd,
                       Elf_Internal_Rela *      rel,
                       Elf_Internal_Shdr *      symtab_hdr,
-                      Elf_External_Sym_Shndx * shndx_buf ATTRIBUTE_UNUSED,
+                      bfd_byte *               shndx_buf ATTRIBUTE_UNUSED,
                       Elf_Internal_Sym *       intsyms,
                       Elf_Internal_Rela **     lrel,
                       bfd *                    input_bfd,
@@ -2065,7 +2068,7 @@ rl78_elf_relax_section
   bfd_byte *         free_contents = NULL;
   Elf_Internal_Sym *  intsyms = NULL;
   Elf_Internal_Sym *  free_intsyms = NULL;
-  Elf_External_Sym_Shndx * shndx_buf = NULL;
+  bfd_byte *         shndx_buf = NULL;
   bfd_vma pc;
   bfd_vma symval ATTRIBUTE_UNUSED = 0;
   int pcrel ATTRIBUTE_UNUSED = 0;
@@ -2118,17 +2121,20 @@ rl78_elf_relax_section
 
   if (shndx_hdr && shndx_hdr->sh_size != 0)
     {
-      bfd_size_type amt;
+      size_t amt;
 
-      amt = symtab_hdr->sh_info;
-      amt *= sizeof (Elf_External_Sym_Shndx);
-      shndx_buf = (Elf_External_Sym_Shndx *) bfd_malloc (amt);
-      if (shndx_buf == NULL)
+      if (_bfd_mul_overflow (symtab_hdr->sh_info,
+                            sizeof (Elf_External_Sym_Shndx), &amt))
+       {
+         bfd_set_error (bfd_error_no_memory);
+         goto error_return;
+       }
+      if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0)
        goto error_return;
-      if (bfd_seek (abfd, shndx_hdr->sh_offset, SEEK_SET) != 0
-         || bfd_bread (shndx_buf, amt, abfd) != amt)
+      shndx_buf = _bfd_malloc_and_read (abfd, amt, amt);
+      if (shndx_buf == NULL)
        goto error_return;
-      shndx_hdr->contents = (bfd_byte *) shndx_buf;
+      shndx_hdr->contents = shndx_buf;
     }
 
   /* Get a copy of the native relocations.  */