]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - bfd/elf32-h8300.c
Update year range in copyright notice of binutils files
[thirdparty/binutils-gdb.git] / bfd / elf32-h8300.c
index 786787ce9632bfdc59d524484fc9c84c8dd9ad81..617f4ae01e06e0032a79391cd52bc57fc7f01b44 100644 (file)
@@ -1,44 +1,58 @@
-/* Generic support for 32-bit ELF
-   Copyright 1993, 1995, 1998, 1999 Free Software Foundation, Inc.
+/* BFD back-end for Renesas H8/300 ELF binaries.
+   Copyright (C) 1993-2021 Free Software Foundation, Inc.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libbfd.h"
 #include "elf-bfd.h"
 #include "elf/h8.h"
+#include "cpu-h8300.h"
 
 static reloc_howto_type *elf32_h8_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void elf32_h8_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static void elf32_h8_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
-static int elf32_h8_mach
-  PARAMS ((flagword));
+  (bfd *abfd, bfd_reloc_code_real_type code);
+static bfd_boolean elf32_h8_info_to_howto
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static bfd_boolean elf32_h8_info_to_howto_rel
+  (bfd *, arelent *, Elf_Internal_Rela *);
+static unsigned long elf32_h8_mach (flagword);
+static bfd_boolean elf32_h8_object_p (bfd *);
+static bfd_boolean elf32_h8_merge_private_bfd_data
+  (bfd *, struct bfd_link_info *);
+static bfd_boolean elf32_h8_relax_section
+  (bfd *, asection *, struct bfd_link_info *, bfd_boolean *);
+static bfd_boolean elf32_h8_relax_delete_bytes
+  (bfd *, asection *, bfd_vma, int);
+static bfd_boolean elf32_h8_symbol_address_p (bfd *, asection *, bfd_vma);
+static bfd_byte *elf32_h8_get_relocated_section_contents
+  (bfd *, struct bfd_link_info *, struct bfd_link_order *,
+   bfd_byte *, bfd_boolean, asymbol **);
 static bfd_reloc_status_type elf32_h8_final_link_relocate
-  PARAMS ((unsigned long, bfd *, bfd *, asection *,
-          bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
-          struct bfd_link_info *, asection *, int));
-static boolean elf32_h8_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-          bfd_byte *, Elf_Internal_Rela *,
-          Elf_Internal_Sym *, asection **));
+  (unsigned long, bfd *, bfd *, asection *,
+   bfd_byte *, bfd_vma, bfd_vma, bfd_vma,
+   struct bfd_link_info *, asection *, int);
+static bfd_boolean elf32_h8_relocate_section
+  (bfd *, struct bfd_link_info *, bfd *, asection *,
+   bfd_byte *, Elf_Internal_Rela *,
+   Elf_Internal_Sym *, asection **);
+static bfd_reloc_status_type special
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
 
 /* This does not include any relocation information, but should be
    good enough for GDB or objdump to read the file.  */
@@ -48,143 +62,183 @@ static reloc_howto_type h8_elf_howto_table[] =
 #define R_H8_NONE_X 0
   HOWTO (R_H8_NONE,            /* type */
         0,                     /* rightshift */
-        0,                     /* size (0 = byte, 1 = short, 2 = long) */
+        3,                     /* size (0 = byte, 1 = short, 2 = long) */
         0,                     /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        NULL,                  /* special_function */
+        complain_overflow_dont,/* complain_on_overflow */
+        special,               /* special_function */
         "R_H8_NONE",           /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0,                     /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 #define R_H8_DIR32_X (R_H8_NONE_X + 1)
   HOWTO (R_H8_DIR32,           /* type */
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         32,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        NULL,                  /* special_function */
+        complain_overflow_dont,/* complain_on_overflow */
+        special,               /* special_function */
         "R_H8_DIR32",          /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0xffffffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 #define R_H8_DIR16_X (R_H8_DIR32_X + 1)
   HOWTO (R_H8_DIR16,           /* type */
         0,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        NULL,                  /* special_function */
+        complain_overflow_dont,/* complain_on_overflow */
+        special,               /* special_function */
         "R_H8_DIR16",          /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0x0000ffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 #define R_H8_DIR8_X (R_H8_DIR16_X + 1)
   HOWTO (R_H8_DIR8,            /* type */
         0,                     /* rightshift */
         0,                     /* size (0 = byte, 1 = short, 2 = long) */
         8,                     /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        NULL,                  /* special_function */
-        "R_H8_DIR16",          /* name */
-        false,                 /* partial_inplace */
+        complain_overflow_dont,/* complain_on_overflow */
+        special,               /* special_function */
+        "R_H8_DIR8",           /* name */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0x000000ff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 #define R_H8_DIR16A8_X (R_H8_DIR8_X + 1)
   HOWTO (R_H8_DIR16A8,         /* type */
         0,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
-        NULL,                  /* special_function */
+        special,               /* special_function */
         "R_H8_DIR16A8",        /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0x0000ffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 #define R_H8_DIR16R8_X (R_H8_DIR16A8_X + 1)
   HOWTO (R_H8_DIR16R8,         /* type */
         0,                     /* rightshift */
         1,                     /* size (0 = byte, 1 = short, 2 = long) */
         16,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
-        NULL,                  /* special_function */
+        special,               /* special_function */
         "R_H8_DIR16R8",        /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0x0000ffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 #define R_H8_DIR24A8_X (R_H8_DIR16R8_X + 1)
   HOWTO (R_H8_DIR24A8,         /* type */
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         24,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
-        NULL,                  /* special_function */
+        special,               /* special_function */
         "R_H8_DIR24A8",        /* name */
-        true,                  /* partial_inplace */
+        TRUE,                  /* partial_inplace */
         0xff000000,            /* src_mask */
         0x00ffffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 #define R_H8_DIR24R8_X (R_H8_DIR24A8_X + 1)
   HOWTO (R_H8_DIR24R8,         /* type */
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         24,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
-        NULL,                  /* special_function */
+        special,               /* special_function */
         "R_H8_DIR24R8",        /* name */
-        true,                  /* partial_inplace */
+        TRUE,                  /* partial_inplace */
         0xff000000,            /* src_mask */
         0x00ffffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
 #define R_H8_DIR32A16_X (R_H8_DIR24R8_X + 1)
   HOWTO (R_H8_DIR32A16,                /* type */
         0,                     /* rightshift */
         2,                     /* size (0 = byte, 1 = short, 2 = long) */
         32,                    /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
-        complain_overflow_dont, /* complain_on_overflow */
-        NULL,                  /* special_function */
-        "R_H8_DIR32",          /* name */
-        false,                 /* partial_inplace */
+        complain_overflow_dont,/* complain_on_overflow */
+        special,               /* special_function */
+        "R_H8_DIR32A16",       /* name */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0xffffffff,            /* dst_mask */
-        false),                /* pcrel_offset */
+        FALSE),                /* pcrel_offset */
+#define R_H8_DISP32A16_X (R_H8_DIR32A16_X + 1)
+  HOWTO (R_H8_DISP32A16,       /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        FALSE,                 /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_dont,/* complain_on_overflow */
+        special,               /* special_function */
+        "R_H8_DISP32A16",      /* name */
+        FALSE,                 /* partial_inplace */
+        0,                     /* src_mask */
+        0xffffffff,            /* dst_mask */
+        FALSE),                /* pcrel_offset */
+#define R_H8_PCREL16_X (R_H8_DISP32A16_X + 1)
+  HOWTO (R_H8_PCREL16,         /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        TRUE,                  /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed,/* complain_on_overflow */
+        special,               /* special_function */
+        "R_H8_PCREL16",        /* name */
+        FALSE,                 /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        TRUE),                 /* pcrel_offset */
+#define R_H8_PCREL8_X (R_H8_PCREL16_X + 1)
+  HOWTO (R_H8_PCREL8,          /* type */
+        0,                     /* rightshift */
+        0,                     /* size (0 = byte, 1 = short, 2 = long) */
+        8,                     /* bitsize */
+        TRUE,                  /* pc_relative */
+        0,                     /* bitpos */
+        complain_overflow_signed,/* complain_on_overflow */
+        special,               /* special_function */
+        "R_H8_PCREL8",         /* name */
+        FALSE,                 /* partial_inplace */
+        0xff,                  /* src_mask */
+        0xff,                  /* dst_mask */
+        TRUE),                 /* pcrel_offset */
 };
 
 /* This structure is used to map BFD reloc codes to H8 ELF relocs.  */
 
-struct elf_reloc_map
-{
+struct elf_reloc_map {
   bfd_reloc_code_real_type bfd_reloc_val;
   unsigned char howto_index;
 };
 
-/* An array mapping BFD reloc codes to SH ELF relocs.  */
+/* An array mapping BFD reloc codes to H8 ELF relocs.  */
 
-static const struct elf_reloc_map h8_reloc_map[] =
-{
+static const struct elf_reloc_map h8_reloc_map[] = {
   { BFD_RELOC_NONE, R_H8_NONE_X },
   { BFD_RELOC_32, R_H8_DIR32_X },
   { BFD_RELOC_16, R_H8_DIR16_X },
@@ -194,13 +248,15 @@ static const struct elf_reloc_map h8_reloc_map[] =
   { BFD_RELOC_H8_DIR24A8, R_H8_DIR24A8_X },
   { BFD_RELOC_H8_DIR24R8, R_H8_DIR24R8_X },
   { BFD_RELOC_H8_DIR32A16, R_H8_DIR32A16_X },
+  { BFD_RELOC_H8_DISP32A16, R_H8_DISP32A16_X },
+  { BFD_RELOC_16_PCREL, R_H8_PCREL16_X },
+  { BFD_RELOC_8_PCREL, R_H8_PCREL8_X },
 };
 
 
 static reloc_howto_type *
-elf32_h8_reloc_type_lookup (abfd, code)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_reloc_code_real_type code;
+elf32_h8_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                           bfd_reloc_code_real_type code)
 {
   unsigned int i;
 
@@ -212,66 +268,93 @@ elf32_h8_reloc_type_lookup (abfd, code)
   return NULL;
 }
 
-static void
-elf32_h8_info_to_howto (abfd, bfd_reloc, elf_reloc)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *bfd_reloc;
-     Elf32_Internal_Rela *elf_reloc;
+static reloc_howto_type *
+elf32_h8_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                           const char *r_name)
+{
+  unsigned int i;
+
+  for (i = 0;
+       i < sizeof (h8_elf_howto_table) / sizeof (h8_elf_howto_table[0]);
+       i++)
+    if (h8_elf_howto_table[i].name != NULL
+       && strcasecmp (h8_elf_howto_table[i].name, r_name) == 0)
+      return &h8_elf_howto_table[i];
+
+  return NULL;
+}
+
+static bfd_boolean
+elf32_h8_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, arelent *bfd_reloc,
+                       Elf_Internal_Rela *elf_reloc)
 {
   unsigned int r;
   unsigned int i;
 
   r = ELF32_R_TYPE (elf_reloc->r_info);
   for (i = 0; i < sizeof (h8_elf_howto_table) / sizeof (reloc_howto_type); i++)
-    if (h8_elf_howto_table[i].type== r)
+    if (h8_elf_howto_table[i].type == r)
       {
        bfd_reloc->howto = &h8_elf_howto_table[i];
-       return;
+       return TRUE;
       }
-  abort ();
+  /* xgettext:c-format */
+  _bfd_error_handler (_("%pB: unsupported relocation type %#x"), abfd, r);
+  bfd_set_error (bfd_error_bad_value);
+  return FALSE;
 }
 
-static void
-elf32_h8_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *bfd_reloc;
-     Elf32_Internal_Rel *elf_reloc ATTRIBUTE_UNUSED;
+static bfd_boolean
+elf32_h8_info_to_howto_rel (bfd *abfd ATTRIBUTE_UNUSED,
+                           arelent *bfd_reloc ATTRIBUTE_UNUSED,
+                           Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED)
 {
-  unsigned int r;
-
-  abort ();
-  r = ELF32_R_TYPE (elf_reloc->r_info);
-  bfd_reloc->howto = &h8_elf_howto_table[r];
+  return FALSE;
 }
 
+/* Special handling for H8/300 relocs.
+   We only come here for pcrel stuff and return normally if not an -r link.
+   When doing -r, we can't do any arithmetic for the pcrel stuff, because
+   we support relaxing on the H8/300 series chips.  */
+static bfd_reloc_status_type
+special (bfd *abfd ATTRIBUTE_UNUSED,
+        arelent *reloc_entry ATTRIBUTE_UNUSED,
+        asymbol *symbol ATTRIBUTE_UNUSED,
+        void * data ATTRIBUTE_UNUSED,
+        asection *input_section ATTRIBUTE_UNUSED,
+        bfd *output_bfd,
+        char **error_message ATTRIBUTE_UNUSED)
+{
+  if (output_bfd == (bfd *) NULL)
+    return bfd_reloc_continue;
+
+  /* Adjust the reloc address to that in the output section.  */
+  reloc_entry->address += input_section->output_offset;
+  return bfd_reloc_ok;
+}
 
 /* Perform a relocation as part of a final link.  */
 static bfd_reloc_status_type
-elf32_h8_final_link_relocate (r_type, input_bfd, output_bfd,
-                             input_section, contents, offset, value,
-                             addend, info, sym_sec, is_local)
-     unsigned long r_type;
-     bfd *input_bfd;
-     bfd *output_bfd ATTRIBUTE_UNUSED;
-     asection *input_section ATTRIBUTE_UNUSED;
-     bfd_byte *contents;
-     bfd_vma offset;
-     bfd_vma value;
-     bfd_vma addend;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     asection *sym_sec ATTRIBUTE_UNUSED;
-     int is_local ATTRIBUTE_UNUSED;
+elf32_h8_final_link_relocate (unsigned long r_type, bfd *input_bfd,
+                             bfd *output_bfd ATTRIBUTE_UNUSED,
+                             asection *input_section ATTRIBUTE_UNUSED,
+                             bfd_byte *contents, bfd_vma offset,
+                             bfd_vma value, bfd_vma addend,
+                             struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                             asection *sym_sec ATTRIBUTE_UNUSED,
+                             int is_local ATTRIBUTE_UNUSED)
 {
   bfd_byte *hit_data = contents + offset;
 
   switch (r_type)
     {
-
     case R_H8_NONE:
       return bfd_reloc_ok;
 
     case R_H8_DIR32:
     case R_H8_DIR32A16:
+    case R_H8_DISP32A16:
+    case R_H8_DIR24A8:
       value += addend;
       bfd_put_32 (input_bfd, value, hit_data);
       return bfd_reloc_ok;
@@ -287,41 +370,67 @@ elf32_h8_final_link_relocate (r_type, input_bfd, output_bfd,
     case R_H8_DIR8:
       value += addend;
 
-      if ((long) value > 0x7f || (long) value < -0x80)
-       return bfd_reloc_overflow;
-
       bfd_put_8 (input_bfd, value, hit_data);
       return bfd_reloc_ok;
 
-    case R_H8_DIR24A8:
     case R_H8_DIR24R8:
       value += addend;
 
-      if ((long) value > 0x7fffff || (long) value < -0x800000)
-       return bfd_reloc_overflow;
+      /* HIT_DATA is the address for the first byte for the relocated
+        value.  Subtract 1 so that we can manipulate the data in 32-bit
+        hunks.  */
+      hit_data--;
 
+      /* Clear out the top byte in value.  */
       value &= 0xffffff;
+
+      /* Retrieve the type byte for value from the section contents.  */
       value |= (bfd_get_32 (input_bfd, hit_data) & 0xff000000);
+
+      /* Now scribble it out in one 32-bit hunk.  */
       bfd_put_32 (input_bfd, value, hit_data);
       return bfd_reloc_ok;
 
+    case R_H8_PCREL16:
+      value -= (input_section->output_section->vma
+               + input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      /* The value is relative to the start of the instruction,
+        not the relocation offset.  Subtract 2 to account for
+        this minor issue.  */
+      value -= 2;
+
+      bfd_put_16 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
+    case R_H8_PCREL8:
+      value -= (input_section->output_section->vma
+               + input_section->output_offset);
+      value -= offset;
+      value += addend;
+
+      /* The value is relative to the start of the instruction,
+        not the relocation offset.  Subtract 1 to account for
+        this minor issue.  */
+      value -= 1;
+
+      bfd_put_8 (input_bfd, value, hit_data);
+      return bfd_reloc_ok;
+
     default:
       return bfd_reloc_notsupported;
     }
 }
 \f
 /* Relocate an H8 ELF section.  */
-static boolean
-elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
-                          contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
+static bfd_boolean
+elf32_h8_relocate_section (bfd *output_bfd, struct bfd_link_info *info,
+                          bfd *input_bfd, asection *input_section,
+                          bfd_byte *contents, Elf_Internal_Rela *relocs,
+                          Elf_Internal_Sym *local_syms,
+                          asection **local_sections)
 {
   Elf_Internal_Shdr *symtab_hdr;
   struct elf_link_hash_entry **sym_hashes;
@@ -334,37 +443,22 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
   relend = relocs + input_section->reloc_count;
   for (; rel < relend; rel++)
     {
-      int r_type;
+      unsigned int r_type;
       unsigned long r_symndx;
       Elf_Internal_Sym *sym;
       asection *sec;
       struct elf_link_hash_entry *h;
       bfd_vma relocation;
       bfd_reloc_status_type r;
+      arelent bfd_reloc;
+      reloc_howto_type *howto;
+
+      if (! elf32_h8_info_to_howto (input_bfd, &bfd_reloc, rel))
+       continue;
+      howto = bfd_reloc.howto;
 
       r_symndx = ELF32_R_SYM (rel->r_info);
       r_type = ELF32_R_TYPE (rel->r_info);
-
-      if (info->relocateable)
-       {
-         /* This is a relocateable link.  We don't have to change
-             anything, unless the reloc is against a section symbol,
-             in which case we have to adjust according to where the
-             section symbol winds up in the output section.  */
-         if (r_symndx < symtab_hdr->sh_info)
-           {
-             sym = local_syms + r_symndx;
-             if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-               {
-                 sec = local_sections[r_symndx];
-                 rel->r_addend += sec->output_offset + sym->st_value;
-               }
-           }
-
-         continue;
-       }
-
-      /* This is a final link.  */
       h = NULL;
       sym = NULL;
       sec = NULL;
@@ -372,36 +466,25 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
        {
          sym = local_syms + r_symndx;
          sec = local_sections[r_symndx];
-         relocation = (sec->output_section->vma
-                       + sec->output_offset
-                       + sym->st_value);
+         relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel);
        }
       else
        {
-         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-         while (h->root.type == bfd_link_hash_indirect
-                || h->root.type == bfd_link_hash_warning)
-           h = (struct elf_link_hash_entry *) h->root.u.i.link;
-         if (h->root.type == bfd_link_hash_defined
-             || h->root.type == bfd_link_hash_defweak)
-           {
-             sec = h->root.u.def.section;
-             relocation = (h->root.u.def.value
-                           + sec->output_section->vma
-                           + sec->output_offset);
-           }
-         else if (h->root.type == bfd_link_hash_undefweak)
-           relocation = 0;
-         else
-           {
-             if (! ((*info->callbacks->undefined_symbol)
-                    (info, h->root.root.string, input_bfd,
-                     input_section, rel->r_offset, true)))
-               return false;
-             relocation = 0;
-           }
+         bfd_boolean unresolved_reloc, warned, ignored;
+
+         RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel,
+                                  r_symndx, symtab_hdr, sym_hashes,
+                                  h, sec, relocation,
+                                  unresolved_reloc, warned, ignored);
        }
 
+      if (sec != NULL && discarded_section (sec))
+       RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section,
+                                        rel, 1, relend, howto, 0, contents);
+
+      if (bfd_link_relocatable (info))
+       continue;
+
       r = elf32_h8_final_link_relocate (r_type, input_bfd, output_bfd,
                                        input_section,
                                        contents, rel->r_offset,
@@ -412,12 +495,7 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
        {
          const char *name;
          const char *msg = (const char *) 0;
-         arelent bfd_reloc;
-         reloc_howto_type *howto;
 
-         elf32_h8_info_to_howto (input_bfd, &bfd_reloc, rel);
-         howto = bfd_reloc.howto;
-         
          if (h != NULL)
            name = h->root.root.string;
          else
@@ -425,23 +503,20 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
              name = (bfd_elf_string_from_elf_section
                      (input_bfd, symtab_hdr->sh_link, sym->st_name));
              if (name == NULL || *name == '\0')
-               name = bfd_section_name (input_bfd, sec);
+               name = bfd_section_name (sec);
            }
 
          switch (r)
            {
            case bfd_reloc_overflow:
-             if (! ((*info->callbacks->reloc_overflow)
-                    (info, name, howto->name, (bfd_vma) 0,
-                     input_bfd, input_section, rel->r_offset)))
-               return false;
+             (*info->callbacks->reloc_overflow)
+               (info, (h ? &h->root : NULL), name, howto->name,
+                (bfd_vma) 0, input_bfd, input_section, rel->r_offset);
              break;
 
            case bfd_reloc_undefined:
-             if (! ((*info->callbacks->undefined_symbol)
-                    (info, name, input_bfd, input_section,
-                     rel->r_offset, true)))
-               return false;
+             (*info->callbacks->undefined_symbol)
+               (info, name, input_bfd, input_section, rel->r_offset, TRUE);
              break;
 
            case bfd_reloc_outofrange:
@@ -461,16 +536,14 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
              /* fall through */
 
            common_error:
-             if (!((*info->callbacks->warning)
-                   (info, msg, name, input_bfd, input_section,
-                    rel->r_offset)))
-               return false;
+             (*info->callbacks->warning) (info, msg, name, input_bfd,
+                                          input_section, rel->r_offset);
              break;
            }
        }
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Object files encode the specific H8 model they were compiled
@@ -478,9 +551,8 @@ elf32_h8_relocate_section (output_bfd, info, input_bfd, input_section,
 
    Examine that field and return the proper BFD machine type for
    the object file.  */
-static int
-elf32_h8_mach (flags)
-     flagword flags;
+static unsigned long
+elf32_h8_mach (flagword flags)
 {
   switch (flags & EF_H8_MACH)
     {
@@ -493,6 +565,18 @@ elf32_h8_mach (flags)
 
     case E_H8_MACH_H8300S:
       return bfd_mach_h8300s;
+
+    case E_H8_MACH_H8300HN:
+      return bfd_mach_h8300hn;
+
+    case E_H8_MACH_H8300SN:
+      return bfd_mach_h8300sn;
+
+    case E_H8_MACH_H8300SX:
+      return bfd_mach_h8300sx;
+
+    case E_H8_MACH_H8300SXN:
+      return bfd_mach_h8300sxn;
     }
 }
 
@@ -500,10 +584,8 @@ elf32_h8_mach (flags)
    file.  We use this opportunity to encode the BFD machine type
    into the flags field in the object file.  */
 
-void
-elf32_h8_final_write_processing (abfd, linker)
-     bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+static bfd_boolean
+elf32_h8_final_write_processing (bfd *abfd)
 {
   unsigned long val;
 
@@ -521,55 +603,1107 @@ elf32_h8_final_write_processing (abfd, linker)
     case bfd_mach_h8300s:
       val = E_H8_MACH_H8300S;
       break;
+
+    case bfd_mach_h8300hn:
+      val = E_H8_MACH_H8300HN;
+      break;
+
+    case bfd_mach_h8300sn:
+      val = E_H8_MACH_H8300SN;
+      break;
+
+    case bfd_mach_h8300sx:
+      val = E_H8_MACH_H8300SX;
+      break;
+
+    case bfd_mach_h8300sxn:
+      val = E_H8_MACH_H8300SXN;
+      break;
     }
 
   elf_elfheader (abfd)->e_flags &= ~ (EF_H8_MACH);
   elf_elfheader (abfd)->e_flags |= val;
+  return _bfd_elf_final_write_processing (abfd);
 }
 
 /* Return nonzero if ABFD represents a valid H8 ELF object file; also
    record the encoded machine type found in the ELF flags.  */
 
-boolean
-elf32_h8_object_p (abfd)
-     bfd *abfd;
+static bfd_boolean
+elf32_h8_object_p (bfd *abfd)
 {
   bfd_default_set_arch_mach (abfd, bfd_arch_h8300,
                             elf32_h8_mach (elf_elfheader (abfd)->e_flags));
-  return true;
+  return TRUE;
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  The only data we need to copy at this
    time is the architecture/machine information.  */
 
-boolean
-elf32_h8_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
+static bfd_boolean
+elf32_h8_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info)
 {
+  bfd *obfd = info->output_bfd;
+
   if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
+    return TRUE;
 
   if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
       && bfd_get_mach (obfd) < bfd_get_mach (ibfd))
     {
       if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
-                               bfd_get_mach (ibfd)))
-        return false;
+                              bfd_get_mach (ibfd)))
+       return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
+/* This function handles relaxing for the H8..
+
+   There are a few relaxing opportunities available on the H8:
+
+     jmp/jsr:24           ->    bra/bsr:8              2 bytes
+     The jmp may be completely eliminated if the previous insn is a
+     conditional branch to the insn after the jump.  In that case
+     we invert the branch and delete the jump and save 4 bytes.
+
+     bCC:16         ->    bCC:8                  2 bytes
+     bsr:16         ->    bsr:8                  2 bytes
+
+     bset:16        ->    bset:8                 2 bytes
+     bset:24/32             ->    bset:8                 4 bytes
+     (also applicable to other bit manipulation instructions)
+
+     mov.b:16       ->    mov.b:8                2 bytes
+     mov.b:24/32     ->           mov.b:8                4 bytes
+
+     bset:24/32             ->    bset:16                2 bytes
+     (also applicable to other bit manipulation instructions)
+
+     mov.[bwl]:24/32 ->           mov.[bwl]:16           2 bytes
 
-#define TARGET_BIG_SYM                 bfd_elf32_h8300_vec
+     mov.[bwl] @(displ:24/32+ERx) -> mov.[bwl] @(displ:16+ERx) 4 bytes.  */
+
+static bfd_boolean
+elf32_h8_relax_section (bfd *abfd, asection *sec,
+                       struct bfd_link_info *link_info, bfd_boolean *again)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+  static asection *last_input_section = NULL;
+  static Elf_Internal_Rela *last_reloc = NULL;
+
+  /* Assume nothing changes.  */
+  *again = FALSE;
+
+  /* We don't have to do anything for a relocatable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (bfd_link_relocatable (link_info)
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return TRUE;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf_link_read_relocs
+                    (abfd, sec, NULL, (Elf_Internal_Rela *) NULL,
+                     link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+
+  if (sec != last_input_section)
+    last_reloc = NULL;
+
+  last_input_section = sec;
+
+  /* Walk through the relocs looking for relaxing opportunities.  */
+  irelend = internal_relocs + sec->reloc_count;
+  for (irel = internal_relocs; irel < irelend; irel++)
+    {
+      bfd_vma symval;
+
+      {
+       arelent bfd_reloc;
+
+       if (! elf32_h8_info_to_howto (abfd, &bfd_reloc, irel))
+         continue;
+      }
+      /* Keep track of the previous reloc so that we can delete
+        some long jumps created by the compiler.  */
+      if (irel != internal_relocs)
+       last_reloc = irel - 1;
+
+      switch(ELF32_R_TYPE (irel->r_info))
+       {
+       case R_H8_DIR24R8:
+       case R_H8_PCREL16:
+       case R_H8_DIR16A8:
+       case R_H8_DIR24A8:
+       case R_H8_DIR32A16:
+       case R_H8_DISP32A16:
+         break;
+       default:
+         continue;
+       }
+
+      /* Get the section contents if we haven't done so already.  */
+      if (contents == NULL)
+       {
+         /* Get cached copy if it exists.  */
+         if (elf_section_data (sec)->this_hdr.contents != NULL)
+           contents = elf_section_data (sec)->this_hdr.contents;
+         else
+           {
+             /* Go get them off disk.  */
+             if (!bfd_malloc_and_get_section (abfd, sec, &contents))
+               goto error_return;
+           }
+       }
+
+      /* Read this BFD's local symbols if we haven't done so already.  */
+      if (isymbuf == NULL && symtab_hdr->sh_info != 0)
+       {
+         isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+         if (isymbuf == NULL)
+           isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr,
+                                           symtab_hdr->sh_info, 0,
+                                           NULL, NULL, NULL);
+         if (isymbuf == NULL)
+           goto error_return;
+       }
+
+      /* Get the value of the symbol referred to by the reloc.  */
+      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
+       {
+         /* A local symbol.  */
+         Elf_Internal_Sym *isym;
+         asection *sym_sec;
+
+         isym = isymbuf + ELF32_R_SYM (irel->r_info);
+         sym_sec = bfd_section_from_elf_index (abfd, isym->st_shndx);
+         symval = isym->st_value;
+         /* If the reloc is absolute, it will not have
+            a symbol or section associated with it.  */
+         if (sym_sec)
+           symval += sym_sec->output_section->vma
+             + sym_sec->output_offset;
+       }
+      else
+       {
+         unsigned long indx;
+         struct elf_link_hash_entry *h;
+
+         /* An external symbol.  */
+         indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
+         h = elf_sym_hashes (abfd)[indx];
+         BFD_ASSERT (h != NULL);
+         if (h->root.type != bfd_link_hash_defined
+             && h->root.type != bfd_link_hash_defweak)
+           {
+             /* This appears to be a reference to an undefined
+                symbol.  Just ignore it--it will be caught by the
+                regular reloc processing.  */
+             continue;
+           }
+
+         symval = (h->root.u.def.value
+                   + h->root.u.def.section->output_section->vma
+                   + h->root.u.def.section->output_offset);
+       }
+
+      /* For simplicity of coding, we are going to modify the section
+        contents, the section relocs, and the BFD symbol table.  We
+        must tell the rest of the code not to free up this
+        information.  It would be possible to instead create a table
+        of changes which have to be made, as is done in coff-mips.c;
+        that would be more work, but would require less memory when
+        the linker is run.  */
+      switch (ELF32_R_TYPE (irel->r_info))
+       {
+         /* Try to turn a 24-bit absolute branch/call into an 8-bit
+            pc-relative branch/call.  */
+       case R_H8_DIR24R8:
+         {
+           bfd_vma value = symval + irel->r_addend;
+           bfd_vma dot, gap;
+
+           /* Get the address of this instruction.  */
+           dot = (sec->output_section->vma
+                  + sec->output_offset + irel->r_offset - 1);
+
+           /* Compute the distance from this insn to the branch target.  */
+           gap = value - dot;
+
+           /* If the distance is within -126..+130 inclusive, then we can
+              relax this jump.  +130 is valid since the target will move
+              two bytes closer if we do relax this branch.  */
+           if ((int) gap >= -126 && (int) gap <= 130)
+             {
+               unsigned char code;
+
+               /* Note that we've changed the relocs, section contents,
+                  etc.  */
+               elf_section_data (sec)->relocs = internal_relocs;
+               elf_section_data (sec)->this_hdr.contents = contents;
+               symtab_hdr->contents = (unsigned char *) isymbuf;
+
+               /* Get the instruction code being relaxed.  */
+               code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+               /* If the previous instruction conditionally jumped around
+                  this instruction, we may be able to reverse the condition
+                  and redirect the previous instruction to the target of
+                  this instruction.
+
+                  Such sequences are used by the compiler to deal with
+                  long conditional branches.
+
+                  Only perform this optimisation for jumps (code 0x5a) not
+                  subroutine calls, as otherwise it could transform:
+
+                  mov.w   r0,r0
+                  beq     .L1
+                  jsr     @_bar
+                  .L1:   rts
+                  _bar:  rts
+                  into:
+                  mov.w   r0,r0
+                  bne     _bar
+                  rts
+                  _bar:  rts
+
+                  which changes the call (jsr) into a branch (bne).  */
+               if (code == 0x5a        /* jmp24.  */
+                   && (int) gap <= 130
+                   && (int) gap >= -128
+                   && last_reloc
+                   && ELF32_R_TYPE (last_reloc->r_info) == R_H8_PCREL8
+                   && ELF32_R_SYM (last_reloc->r_info) < symtab_hdr->sh_info)
+                 {
+                   bfd_vma last_value;
+                   asection *last_sym_sec;
+                   Elf_Internal_Sym *last_sym;
+
+                   /* We will need to examine the symbol used by the
+                      previous relocation.  */
+
+                   last_sym = isymbuf + ELF32_R_SYM (last_reloc->r_info);
+                   last_sym_sec
+                     = bfd_section_from_elf_index (abfd, last_sym->st_shndx);
+                   last_value = (last_sym->st_value
+                                 + last_sym_sec->output_section->vma
+                                 + last_sym_sec->output_offset);
+
+                   /* Verify that the previous relocation was for a
+                      branch around this instruction and that no symbol
+                      exists at the current location.  */
+                   if (last_value == dot + 4
+                       && last_reloc->r_offset + 2 == irel->r_offset
+                       && ! elf32_h8_symbol_address_p (abfd, sec, dot))
+                     {
+                       /* We can eliminate this jump.  Twiddle the
+                          previous relocation as necessary.  */
+                       irel->r_info
+                         = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                         ELF32_R_TYPE (R_H8_NONE));
+
+                       last_reloc->r_info
+                         = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                         ELF32_R_TYPE (R_H8_PCREL8));
+                       last_reloc->r_addend = irel->r_addend;
+
+                       code = bfd_get_8 (abfd,
+                                         contents + last_reloc->r_offset - 1);
+                       code ^= 1;
+                       bfd_put_8 (abfd,
+                                  code,
+                                  contents + last_reloc->r_offset - 1);
+
+                       /* Delete four bytes of data.  */
+                       if (!elf32_h8_relax_delete_bytes (abfd, sec,
+                                                         irel->r_offset - 1,
+                                                         4))
+                         goto error_return;
+
+                       *again = TRUE;
+                       break;
+                     }
+                 }
+
+               if (code == 0x5e)
+                 /* This is jsr24  */
+                 bfd_put_8 (abfd, 0x55, contents + irel->r_offset - 1);        /* bsr8. */
+               else if (code == 0x5a)
+                 /* This is jmp24  */
+                 bfd_put_8 (abfd, 0x40, contents + irel->r_offset - 1);        /* bra8. */
+               else
+                 abort ();
+
+               /* Fix the relocation's type.  */
+               irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                            R_H8_PCREL8);
+
+               /* Delete two bytes of data.  */
+               if (!elf32_h8_relax_delete_bytes (abfd, sec,
+                                                 irel->r_offset + 1, 2))
+                 goto error_return;
+
+               /* That will change things, so, we should relax again.
+                  Note that this is not required, and it may be slow.  */
+               *again = TRUE;
+             }
+           break;
+         }
+
+         /* Try to turn a 16-bit pc-relative branch into a 8-bit pc-relative
+            branch.  */
+       case R_H8_PCREL16:
+         {
+           bfd_vma value = symval + irel->r_addend;
+           bfd_vma dot;
+           bfd_vma gap;
+
+           /* Get the address of this instruction.  */
+           dot = (sec->output_section->vma
+                  + sec->output_offset
+                  + irel->r_offset - 2);
+
+           gap = value - dot;
+
+           /* If the distance is within -126..+130 inclusive, then we can
+              relax this jump.  +130 is valid since the target will move
+              two bytes closer if we do relax this branch.  */
+           if ((int) gap >= -126 && (int) gap <= 130)
+             {
+               unsigned char code;
+
+               /* Note that we've changed the relocs, section contents,
+                  etc.  */
+               elf_section_data (sec)->relocs = internal_relocs;
+               elf_section_data (sec)->this_hdr.contents = contents;
+               symtab_hdr->contents = (unsigned char *) isymbuf;
+
+               /* Get the opcode.  */
+               code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+               if (code == 0x58)
+                 {
+                   /* bCC:16 -> bCC:8 */
+                   /* Get the second byte of the original insn, which
+                      contains the condition code.  */
+                   code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+                   /* Compute the first byte of the relaxed
+                      instruction.  The original sequence 0x58 0xX0
+                      is relaxed to 0x4X, where X represents the
+                      condition code.  */
+                   code &= 0xf0;
+                   code >>= 4;
+                   code |= 0x40;
+                   bfd_put_8 (abfd, code, contents + irel->r_offset - 2); /* bCC:8.  */
+                 }
+               else if (code == 0x5c)  /* bsr16.  */
+                 /* This is bsr.  */
+                 bfd_put_8 (abfd, 0x55, contents + irel->r_offset - 2);  /* bsr8.  */
+               else
+                 /* Might be MOVSD.  */
+                 break;
+
+               /* Fix the relocation's type.  */
+               irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                            R_H8_PCREL8);
+               irel->r_offset--;
+
+               /* Delete two bytes of data.  */
+               if (!elf32_h8_relax_delete_bytes (abfd, sec,
+                                                 irel->r_offset + 1, 2))
+                 goto error_return;
+
+               /* That will change things, so, we should relax again.
+                  Note that this is not required, and it may be slow.  */
+               *again = TRUE;
+             }
+           break;
+         }
+
+         /* This is a 16-bit absolute address in one of the following
+            instructions:
+
+            "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+            "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", and
+            "mov.b"
+
+            We may relax this into an 8-bit absolute address if it's in
+            the right range.  */
+       case R_H8_DIR16A8:
+         {
+           bfd_vma value;
+
+           value = bfd_h8300_pad_address (abfd, symval + irel->r_addend);
+           if (value >= 0xffffff00u)
+             {
+               unsigned char code;
+               unsigned char temp_code;
+
+               /* Note that we've changed the relocs, section contents,
+                  etc.  */
+               elf_section_data (sec)->relocs = internal_relocs;
+               elf_section_data (sec)->this_hdr.contents = contents;
+               symtab_hdr->contents = (unsigned char *) isymbuf;
+
+               /* Get the opcode.  */
+               code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+               /* All instructions with R_H8_DIR16A8 start with
+                  0x6a.  */
+               if (code != 0x6a)
+                 abort ();
+
+               temp_code = code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+               /* If this is a mov.b instruction, clear the lower
+                  nibble, which contains the source/destination
+                  register number.  */
+               if ((temp_code & 0x10) != 0x10)
+                 temp_code &= 0xf0;
+
+               switch (temp_code)
+                 {
+                 case 0x00:
+                   /* This is mov.b @aa:16,Rd.  */
+                   bfd_put_8 (abfd, (code & 0xf) | 0x20,
+                              contents + irel->r_offset - 2);
+                   break;
+                 case 0x80:
+                   /* This is mov.b Rs,@aa:16.  */
+                   bfd_put_8 (abfd, (code & 0xf) | 0x30,
+                              contents + irel->r_offset - 2);
+                   break;
+                 case 0x18:
+                   /* This is a bit-maniputation instruction that
+                      stores one bit into memory, one of "bclr",
+                      "bist", "bnot", "bset", and "bst".  */
+                   bfd_put_8 (abfd, 0x7f, contents + irel->r_offset - 2);
+                   break;
+                 case 0x10:
+                   /* This is a bit-maniputation instruction that
+                      loads one bit from memory, one of "band",
+                      "biand", "bild", "bior", "bixor", "bld", "bor",
+                      "btst", and "bxor".  */
+                   bfd_put_8 (abfd, 0x7e, contents + irel->r_offset - 2);
+                   break;
+                 default:
+                   abort ();
+                 }
+
+               /* Fix the relocation's type.  */
+               irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                            R_H8_DIR8);
+
+               /* Move the relocation.  */
+               irel->r_offset--;
+
+               /* Delete two bytes of data.  */
+               if (!elf32_h8_relax_delete_bytes (abfd, sec,
+                                                 irel->r_offset + 1, 2))
+                 goto error_return;
+
+               /* That will change things, so, we should relax again.
+                  Note that this is not required, and it may be slow.  */
+               *again = TRUE;
+             }
+           break;
+         }
+
+         /* This is a 24-bit absolute address in one of the following
+            instructions:
+
+            "band", "bclr", "biand", "bild", "bior", "bist", "bixor",
+            "bld", "bnot", "bor", "bset", "bst", "btst", "bxor", and
+            "mov.b"
+
+            We may relax this into an 8-bit absolute address if it's in
+            the right range.  */
+       case R_H8_DIR24A8:
+         {
+           bfd_vma value;
+
+           value = bfd_h8300_pad_address (abfd, symval + irel->r_addend);
+           if (value >= 0xffffff00u)
+             {
+               unsigned char code;
+               unsigned char temp_code;
+
+               /* Note that we've changed the relocs, section contents,
+                  etc.  */
+               elf_section_data (sec)->relocs = internal_relocs;
+               elf_section_data (sec)->this_hdr.contents = contents;
+               symtab_hdr->contents = (unsigned char *) isymbuf;
+
+               /* Get the opcode.  */
+               code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+               /* All instructions with R_H8_DIR24A8 start with
+                  0x6a.  */
+               if (code != 0x6a)
+                 abort ();
+
+               temp_code = code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+               /* If this is a mov.b instruction, clear the lower
+                  nibble, which contains the source/destination
+                  register number.  */
+               if ((temp_code & 0x30) != 0x30)
+                 temp_code &= 0xf0;
+
+               switch (temp_code)
+                 {
+                 case 0x20:
+                   /* This is mov.b @aa:24/32,Rd.  */
+                   bfd_put_8 (abfd, (code & 0xf) | 0x20,
+                              contents + irel->r_offset - 2);
+                   break;
+                 case 0xa0:
+                   /* This is mov.b Rs,@aa:24/32.  */
+                   bfd_put_8 (abfd, (code & 0xf) | 0x30,
+                              contents + irel->r_offset - 2);
+                   break;
+                 case 0x38:
+                   /* This is a bit-maniputation instruction that
+                      stores one bit into memory, one of "bclr",
+                      "bist", "bnot", "bset", and "bst".  */
+                   bfd_put_8 (abfd, 0x7f, contents + irel->r_offset - 2);
+                   break;
+                 case 0x30:
+                   /* This is a bit-maniputation instruction that
+                      loads one bit from memory, one of "band",
+                      "biand", "bild", "bior", "bixor", "bld", "bor",
+                      "btst", and "bxor".  */
+                   bfd_put_8 (abfd, 0x7e, contents + irel->r_offset - 2);
+                   break;
+                 default:
+                   abort();
+                 }
+
+               /* Fix the relocation's type.  */
+               irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                            R_H8_DIR8);
+               irel->r_offset--;
+
+               /* Delete four bytes of data.  */
+               if (!elf32_h8_relax_delete_bytes (abfd, sec,
+                                                 irel->r_offset + 1, 4))
+                 goto error_return;
+
+               /* That will change things, so, we should relax again.
+                  Note that this is not required, and it may be slow.  */
+               *again = TRUE;
+               break;
+             }
+         }
+
+         /* Fall through.  */
+
+         /* This is a 24-/32-bit absolute address in one of the
+            following instructions:
+
+            "band", "bclr", "biand", "bild", "bior", "bist",
+            "bixor", "bld", "bnot", "bor", "bset", "bst", "btst",
+            "bxor", "ldc.w", "stc.w" and "mov.[bwl]"
+
+            We may relax this into an 16-bit absolute address if it's
+            in the right range.  */
+       case R_H8_DIR32A16:
+         {
+           bfd_vma value;
+
+           value = bfd_h8300_pad_address (abfd, symval + irel->r_addend);
+           if (value <= 0x7fff || value >= 0xffff8000u)
+             {
+               unsigned char code;
+               unsigned char op0, op1, op2, op3;
+               unsigned char *op_ptr;
+
+               /* Note that we've changed the relocs, section contents,
+                  etc.  */
+               elf_section_data (sec)->relocs = internal_relocs;
+               elf_section_data (sec)->this_hdr.contents = contents;
+               symtab_hdr->contents = (unsigned char *) isymbuf;
+
+               if (irel->r_offset >= 4)
+                 {
+                   /* Check for 4-byte MOVA relaxation (SH-specific).  */
+                   int second_reloc = 0;
+
+                   op_ptr = contents + irel->r_offset - 4;
+
+                   if (last_reloc)
+                     {
+                       arelent bfd_reloc;
+                       reloc_howto_type *h;
+                       bfd_vma last_reloc_size;
+
+                       if (! elf32_h8_info_to_howto (abfd, &bfd_reloc, last_reloc))
+                         break;
+                       h = bfd_reloc.howto;
+                       last_reloc_size = 1 << h->size;
+                       if (last_reloc->r_offset + last_reloc_size
+                           == irel->r_offset)
+                         {
+                           op_ptr -= last_reloc_size;
+                           second_reloc = 1;
+                         }
+                     }
+
+                   if (irel + 1 < irelend)
+                     {
+                       Elf_Internal_Rela *next_reloc = irel + 1;
+                       arelent bfd_reloc;
+                       reloc_howto_type *h;
+                       bfd_vma next_reloc_size;
+
+                       if (! elf32_h8_info_to_howto (abfd, &bfd_reloc, next_reloc))
+                         break;
+                       h = bfd_reloc.howto;
+                       next_reloc_size = 1 << h->size;
+                       if (next_reloc->r_offset + next_reloc_size
+                           == irel->r_offset)
+                         {
+                           op_ptr -= next_reloc_size;
+                           second_reloc = 1;
+                         }
+                     }
+
+                   op0 = bfd_get_8 (abfd, op_ptr + 0);
+                   op1 = bfd_get_8 (abfd, op_ptr + 1);
+                   op2 = bfd_get_8 (abfd, op_ptr + 2);
+                   op3 = bfd_get_8 (abfd, op_ptr + 3);
+
+                   if (op0 == 0x01
+                       && (op1 & 0xdf) == 0x5f
+                       && (op2 & 0x40) == 0x40
+                       && (op3 & 0x80) == 0x80)
+                     {
+                       if ((op2 & 0x08) == 0)
+                         second_reloc = 1;
+
+                       if (second_reloc)
+                         {
+                           op3 &= ~0x08;
+                           bfd_put_8 (abfd, op3, op_ptr + 3);
+                         }
+                       else
+                         {
+                           op2 &= ~0x08;
+                           bfd_put_8 (abfd, op2, op_ptr + 2);
+                         }
+                       goto r_h8_dir32a16_common;
+                     }
+                 }
+
+               /* Now check for short version of MOVA.  (SH-specific) */
+               op_ptr = contents + irel->r_offset - 2;
+               op0 = bfd_get_8 (abfd, op_ptr + 0);
+               op1 = bfd_get_8 (abfd, op_ptr + 1);
+
+               if (op0 == 0x7a
+                   && (op1 & 0x88) == 0x80)
+                 {
+                   op1 |= 0x08;
+                   bfd_put_8 (abfd, op1, op_ptr + 1);
+                   goto r_h8_dir32a16_common;
+                 }
+
+               /* Get the opcode.  */
+               code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+               /* Fix the opcode.  For all the instructions that
+                  belong to this relaxation, we simply need to turn
+                  off bit 0x20 in the previous byte.  */
+               code &= ~0x20;
+
+               bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
+
+             r_h8_dir32a16_common:
+               /* Fix the relocation's type.  */
+               irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+                                            R_H8_DIR16);
+
+               /* Delete two bytes of data.  */
+               if (!elf32_h8_relax_delete_bytes (abfd, sec,
+                                                 irel->r_offset + 1, 2))
+                 goto error_return;
+
+               /* That will change things, so, we should relax again.
+                  Note that this is not required, and it may be slow.  */
+               *again = TRUE;
+             }
+           break;      /* case R_H8_DIR32A16 */
+         }
+
+       case R_H8_DISP32A16:
+         /* mov.[bwl] @(displ:24/32+ERx) -> mov.[bwl] @(displ:16+ERx)  4 bytes
+            It is assured that instruction uses at least 4 bytes opcode before
+            reloc entry addressing mode "register indirect with displacement"
+            relaxing options (all saving 4 bytes):
+            0x78 0sss0000 0x6A 0010dddd disp:32  mov.b @(d:32,ERs),Rd  ->
+            0x6E 0sssdddd disp:16  mov.b @(d:16,ERs),Rd
+            0x78 0sss0000 0x6B 0010dddd disp:32  mov.w @(d:32,ERs),Rd  ->
+            0x6F 0sssdddd disp:16  mov.w @(d:16,ERs),Rd
+            0x01 0x00 0x78 0sss0000 0x6B 00100ddd disp:32  mov.l @(d:32,ERs),ERd ->
+            0x01 0x00 0x6F 0sss0ddd disp:16  mov.l @(d:16,ERs),ERd
+
+            0x78 0ddd0000 0x6A 1010ssss disp:32  mov.b Rs,@(d:32,ERd)  ->
+            0x6E 1dddssss disp:16  mov.b Rs,@(d:16,ERd)
+            0x78 0ddd0000 0x6B 1010ssss disp:32  mov.w Rs,@(d:32,ERd)  ->
+            0x6F 1dddssss disp:16  mov.w Rs,@(d:16,ERd)
+            0x01 0x00 0x78 xddd0000 0x6B 10100sss disp:32  mov.l ERs,@(d:32,ERd) ->
+            0x01 0x00 0x6F 1ddd0sss disp:16  mov.l ERs,@(d:16,ERd)
+            mov.l prefix 0x01 0x00 can be left as is and mov.l handled same
+            as mov.w/  */
+         {
+           bfd_vma value;
+
+           value = bfd_h8300_pad_address (abfd, symval + irel->r_addend);
+           if (value <= 0x7fff || value >= 0xffff8000u)
+             {
+               unsigned char op0, op1, op2, op3, op0n, op1n;
+               int relax = 0;
+
+               /* Note that we've changed the relocs, section contents,
+                  etc.  */
+               elf_section_data (sec)->relocs = internal_relocs;
+               elf_section_data (sec)->this_hdr.contents = contents;
+               symtab_hdr->contents = (unsigned char *) isymbuf;
+
+               if (irel->r_offset >= 4)
+                 {
+                   op0 = bfd_get_8 (abfd, contents + irel->r_offset - 4);
+                   op1 = bfd_get_8 (abfd, contents + irel->r_offset - 3);
+                   op2 = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+                   op3 = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+                   if (op0 == 0x78)
+                     {
+                       switch(op2)
+                         {
+                         case 0x6A:
+                           if ((op1 & 0x8F) == 0x00 && (op3 & 0x70) == 0x20)
+                             {
+                               /* mov.b.  */
+                               op0n = 0x6E;
+                               relax = 1;
+                             }
+                           break;
+                         case 0x6B:
+                           if ((op1 & 0x0F) == 0x00 && (op3 & 0x70) == 0x20)
+                             {
+                               /* mov.w/l.  */
+                               op0n = 0x6F;
+                               relax = 1;
+                             }
+                           break;
+                         default:
+                           break;
+                         }
+                     }
+                 }
+
+               if (relax)
+                 {
+                   op1n = (op3 & 0x8F) | (op1 & 0x70);
+                   bfd_put_8 (abfd, op0n, contents + irel->r_offset - 4);
+                   bfd_put_8 (abfd, op1n, contents + irel->r_offset - 3);
+
+                   /* Fix the relocation's type.  */
+                   irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info), R_H8_DIR16);
+                   irel->r_offset -= 2;
+
+                   /* Delete four bytes of data.  */
+                   if (!elf32_h8_relax_delete_bytes (abfd, sec, irel->r_offset + 2, 4))
+                     goto error_return;
+
+                   /* That will change things, so, we should relax again.
+                      Note that this is not required, and it may be slow.  */
+                   *again = TRUE;
+                 }
+             }
+         }
+         break;
+
+       default:
+         break;
+       }
+    }
+
+  if (isymbuf != NULL
+      && symtab_hdr->contents != (unsigned char *) isymbuf)
+    {
+      if (! link_info->keep_memory)
+       free (isymbuf);
+      else
+       symtab_hdr->contents = (unsigned char *) isymbuf;
+    }
+
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    {
+      if (! link_info->keep_memory)
+       free (contents);
+      else
+       {
+         /* Cache the section contents for elf_link_input_bfd.  */
+         elf_section_data (sec)->this_hdr.contents = contents;
+       }
+    }
+
+  if (elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return TRUE;
+
+ error_return:
+  if (symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+  return FALSE;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static bfd_boolean
+elf32_h8_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  bfd_vma toaddr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  toaddr = sec->size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count,
+          (size_t) (toaddr - addr - count));
+  sec->size -= count;
+
+  /* Adjust all the relocs.  */
+  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
+    {
+      /* Get the new reloc address.  */
+      if ((irel->r_offset > addr
+          && irel->r_offset <= toaddr))
+       irel->r_offset -= count;
+    }
+
+  /* Adjust the local symbols defined in this section.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  isymend = isym + symtab_hdr->sh_info;
+  for (; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+         && isym->st_value > addr
+         && isym->st_value <= toaddr)
+       isym->st_value -= count;
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+             - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+
+      if ((sym_hash->root.type == bfd_link_hash_defined
+          || sym_hash->root.type == bfd_link_hash_defweak)
+         && sym_hash->root.u.def.section == sec
+         && sym_hash->root.u.def.value > addr
+         && sym_hash->root.u.def.value <= toaddr)
+       sym_hash->root.u.def.value -= count;
+    }
+
+  return TRUE;
+}
+
+/* Return TRUE if a symbol exists at the given address, else return
+   FALSE.  */
+static bfd_boolean
+elf32_h8_symbol_address_p (bfd *abfd, asection *sec, bfd_vma addr)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  unsigned int sec_shndx;
+  Elf_Internal_Sym *isym;
+  Elf_Internal_Sym *isymend;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **end_hashes;
+  unsigned int symcount;
+
+  sec_shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  /* Examine all the symbols.  */
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  isym = (Elf_Internal_Sym *) symtab_hdr->contents;
+  isymend = isym + symtab_hdr->sh_info;
+  for (; isym < isymend; isym++)
+    {
+      if (isym->st_shndx == sec_shndx
+         && isym->st_value == addr)
+       return TRUE;
+    }
+
+  symcount = (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+             - symtab_hdr->sh_info);
+  sym_hashes = elf_sym_hashes (abfd);
+  end_hashes = sym_hashes + symcount;
+  for (; sym_hashes < end_hashes; sym_hashes++)
+    {
+      struct elf_link_hash_entry *sym_hash = *sym_hashes;
+      if ((sym_hash->root.type == bfd_link_hash_defined
+          || sym_hash->root.type == bfd_link_hash_defweak)
+         && sym_hash->root.u.def.section == sec
+         && sym_hash->root.u.def.value == addr)
+       return TRUE;
+    }
+
+  return FALSE;
+}
+
+/* This is a version of bfd_generic_get_relocated_section_contents
+   which uses elf32_h8_relocate_section.  */
+
+static bfd_byte *
+elf32_h8_get_relocated_section_contents (bfd *output_bfd,
+                                        struct bfd_link_info *link_info,
+                                        struct bfd_link_order *link_order,
+                                        bfd_byte *data,
+                                        bfd_boolean relocatable,
+                                        asymbol **symbols)
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  asection *input_section = link_order->u.indirect.section;
+  bfd *input_bfd = input_section->owner;
+  asection **sections = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;
+  Elf_Internal_Sym *isymbuf = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocatable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+                                                      link_order, data,
+                                                      relocatable,
+                                                      symbols);
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+         (size_t) input_section->size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      asection **secpp;
+      Elf_Internal_Sym *isym, *isymend;
+      bfd_size_type amt;
+
+      internal_relocs = (_bfd_elf_link_read_relocs
+                        (input_bfd, input_section, NULL,
+                         (Elf_Internal_Rela *) NULL, FALSE));
+      if (internal_relocs == NULL)
+       goto error_return;
+
+      if (symtab_hdr->sh_info != 0)
+       {
+         isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents;
+         if (isymbuf == NULL)
+           isymbuf = bfd_elf_get_elf_syms (input_bfd, symtab_hdr,
+                                           symtab_hdr->sh_info, 0,
+                                           NULL, NULL, NULL);
+         if (isymbuf == NULL)
+           goto error_return;
+       }
+
+      amt = symtab_hdr->sh_info;
+      amt *= sizeof (asection *);
+      sections = (asection **) bfd_malloc (amt);
+      if (sections == NULL && amt != 0)
+       goto error_return;
+
+      isymend = isymbuf + symtab_hdr->sh_info;
+      for (isym = isymbuf, secpp = sections; isym < isymend; ++isym, ++secpp)
+       {
+         asection *isec;
+
+         if (isym->st_shndx == SHN_UNDEF)
+           isec = bfd_und_section_ptr;
+         else if (isym->st_shndx == SHN_ABS)
+           isec = bfd_abs_section_ptr;
+         else if (isym->st_shndx == SHN_COMMON)
+           isec = bfd_com_section_ptr;
+         else
+           isec = bfd_section_from_elf_index (input_bfd, isym->st_shndx);
+
+         *secpp = isec;
+       }
+
+      if (! elf32_h8_relocate_section (output_bfd, link_info, input_bfd,
+                                      input_section, data, internal_relocs,
+                                      isymbuf, sections))
+       goto error_return;
+
+      free (sections);
+      if (symtab_hdr->contents != (unsigned char *) isymbuf)
+       free (isymbuf);
+      if (elf_section_data (input_section)->relocs != internal_relocs)
+       free (internal_relocs);
+    }
+
+  return data;
+
+ error_return:
+  free (sections);
+  if (symtab_hdr->contents != (unsigned char *) isymbuf)
+    free (isymbuf);
+  if (elf_section_data (input_section)->relocs != internal_relocs)
+    free (internal_relocs);
+  return NULL;
+}
+
+
+#define TARGET_BIG_SYM                 h8300_elf32_vec
 #define TARGET_BIG_NAME                        "elf32-h8300"
 #define ELF_ARCH                       bfd_arch_h8300
 #define ELF_MACHINE_CODE               EM_H8_300
 #define ELF_MAXPAGESIZE                        0x1
 #define bfd_elf32_bfd_reloc_type_lookup elf32_h8_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_name_lookup elf32_h8_reloc_name_lookup
 #define elf_info_to_howto              elf32_h8_info_to_howto
 #define elf_info_to_howto_rel          elf32_h8_info_to_howto_rel
 
@@ -584,12 +1718,30 @@ elf32_h8_merge_private_bfd_data (ibfd, obfd)
 
 /* ??? when elf_backend_relocate_section is not defined, elf32-target.h
    defaults to using _bfd_generic_link_hash_table_create, but
-   elflink.h:bfd_elf32_size_dynamic_sections uses
+   bfd_elf_size_dynamic_sections uses
    dynobj = elf_hash_table (info)->dynobj;
    and thus requires an elf hash table.  */
 #define bfd_elf32_bfd_link_hash_table_create _bfd_elf_link_hash_table_create
 
 /* Use an H8 specific linker, not the ELF generic linker.  */
 #define elf_backend_relocate_section elf32_h8_relocate_section
+#define elf_backend_rela_normal                1
+#define elf_backend_can_gc_sections    1
+
+/* And relaxing stuff.  */
+#define bfd_elf32_bfd_relax_section     elf32_h8_relax_section
+#define bfd_elf32_bfd_get_relocated_section_contents \
+                               elf32_h8_get_relocated_section_contents
+
+#define elf_symbol_leading_char '_'
+
+#include "elf32-target.h"
+
+#undef  TARGET_BIG_SYM
+#define TARGET_BIG_SYM                 h8300_elf32_linux_vec
+#undef  TARGET_BIG_NAME
+#define TARGET_BIG_NAME                        "elf32-h8300-linux"
+#undef  elf_symbol_leading_char
+#define elf32_bed                      elf32_h8300_linux_bed
 
 #include "elf32-target.h"