Fix build breakage from last commit (window-nat.c:windows_create_inferior)

[deliverable/binutils-gdb.git] / bfd / coff-h8500.c

diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c
index 1fae964924aa243863e6a6506020aa05d8f0ce8c..7e5844c316dd4973bca1320878ef96b4fa84d555 100644 (file)
--- a/bfd/coff-h8500.c
+++ b/bfd/coff-h8500.c
@@ -1,6 +1,5 @@
 /* BFD back-end for Renesas H8/500 COFF binaries.
-   Copyright 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-   2005, 2007, 2008, 2012  Free Software Foundation, Inc.
+   Copyright (C) 1993-2017 Free Software Foundation, Inc.
    Contributed by Cygnus Support.
    Written by Steve Chamberlain, <sac@cygnus.com>.
 
@@ -96,7 +95,7 @@ rtype2howto (arelent * internal, struct internal_reloc *dst)
   switch (dst->r_type)
     {
     default:
-      abort ();
+      internal->howto = NULL;
       break;
     case R_H8500_IMM8:
       internal->howto = &r_imm8;
@@ -222,7 +221,7 @@ extra_case (bfd *in_abfd,
        v = (v & 0x00ffffff) | (o & 0xff00000);
        bfd_put_32 (in_abfd, (bfd_vma) v, data  + *dst_ptr -1);
        (*dst_ptr) += 3;
-       (*src_ptr) += 3;;
+       (*src_ptr) += 3;
       }
       break;
     case R_H8500_IMM32:
@@ -230,7 +229,7 @@ extra_case (bfd *in_abfd,
        int v = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
        bfd_put_32 (in_abfd, (bfd_vma) v, data  + *dst_ptr);
        (*dst_ptr) += 4;
-       (*src_ptr) += 4;;
+       (*src_ptr) += 4;
       }
       break;
 
@@ -245,14 +244,11 @@ extra_case (bfd *in_abfd,
                                    word and the pc's been incremented.  */
 
        if (gap > 128 || gap < -128)
-         {
-           if (! ((*link_info->callbacks->reloc_overflow)
-                  (link_info, NULL,
-                   bfd_asymbol_name (*reloc->sym_ptr_ptr),
-                   reloc->howto->name, reloc->addend, input_section->owner,
-                   input_section, reloc->address)))
-             abort ();
-         }
+         (*link_info->callbacks->reloc_overflow)
+           (link_info, NULL, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+            reloc->howto->name, reloc->addend, input_section->owner,
+            input_section, reloc->address);
+
        bfd_put_8 (in_abfd, gap, data + *dst_ptr);
        (*dst_ptr)++;
        (*src_ptr)++;
@@ -269,14 +265,11 @@ extra_case (bfd *in_abfd,
                                    word and the pc's been incremented.  */
 
        if (gap > 32767 || gap < -32768)
-         {
-           if (! ((*link_info->callbacks->reloc_overflow)
-                  (link_info, NULL,
-                   bfd_asymbol_name (*reloc->sym_ptr_ptr),
-                   reloc->howto->name, reloc->addend, input_section->owner,
-                   input_section, reloc->address)))
-             abort ();
-         }
+         (*link_info->callbacks->reloc_overflow)
+           (link_info, NULL, bfd_asymbol_name (*reloc->sym_ptr_ptr),
+            reloc->howto->name, reloc->addend, input_section->owner,
+            input_section, reloc->address);
+
        bfd_put_16 (in_abfd, (bfd_vma) gap, data + *dst_ptr);
        (*dst_ptr) += 2;
        (*src_ptr) += 2;
@@ -302,4 +295,4 @@ extra_case (bfd *in_abfd,
   bfd_coff_reloc16_get_relocated_section_contents
 #define coff_bfd_relax_section bfd_coff_reloc16_relax_section
 
-CREATE_BIG_COFF_TARGET_VEC (h8500coff_vec, "coff-h8500", 0, 0, '_', NULL, COFF_SWAP_TABLE)
+CREATE_BIG_COFF_TARGET_VEC (h8500_coff_vec, "coff-h8500", 0, 0, '_', NULL, COFF_SWAP_TABLE)