* elf32-h8300.c (elf32_h8_relax_section): New function.

        (elf32_h8_relax_delete_bytes): Likewise.
        (elf32_h8_symbol_address_p): Likewise.
        (elf32_h8_get_relocated_section_contents): Likewise.
        (bfd_elf32_bfd_relax_section): Define.
        (bfd_elf32_bfd_get_relocated_section_contents): Likewise.

1 files changed, 860 insertions, 0 deletions

diff --git a/bfd/elf32-h8300.c b/bfd/elf32-h8300.c
index 260b57ef3fd..54167b5bf58 100644
--- a/bfd/elf32-h8300.c
+++ b/bfd/elf32-h8300.c
@@ -649,6 +649,860 @@ elf32_h8_merge_private_bfd_data (ibfd, obfd)
   return true;
 }
 
+/* This function handles relaxing for the H8..
+
+   There's a few relaxing opportunites 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
+
+     mov.b:16	     ->    mov.b:8                2 bytes
+     mov.b:24/32     ->    mov.b:8                4 bytes
+
+     mov.[bwl]:24/32 ->    mov.[bwl]:16           2 bytes
+	
+
+*/
+
+static boolean
+elf32_h8_relax_section (abfd, sec, link_info, again)
+     bfd *abfd;
+     asection *sec;
+     struct bfd_link_info *link_info;
+     boolean *again;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf_Internal_Rela *internal_relocs;
+  Elf_Internal_Rela *free_relocs = NULL;
+  Elf_Internal_Rela *irel, *irelend;
+  bfd_byte *contents = NULL;
+  bfd_byte *free_contents = NULL;
+  Elf32_External_Sym *extsyms = NULL;
+  Elf32_External_Sym *free_extsyms = 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 relocateable link, if
+     this section does not have relocs, or if this is not a
+     code section.  */
+  if (link_info->relocateable
+      || (sec->flags & SEC_RELOC) == 0
+      || sec->reloc_count == 0
+      || (sec->flags & SEC_CODE) == 0)
+    return true;
+
+  /* If this is the first time we have been called for this section,
+     initialize the cooked size.  */
+  if (sec->_cooked_size == 0)
+    sec->_cooked_size = sec->_raw_size;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+
+  /* Get a copy of the native relocations.  */
+  internal_relocs = (_bfd_elf32_link_read_relocs
+		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
+		      link_info->keep_memory));
+  if (internal_relocs == NULL)
+    goto error_return;
+  if (! link_info->keep_memory)
+    free_relocs = internal_relocs;
+
+  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;
+
+      /* 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;
+
+      /* 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.  */
+	      contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
+	      if (contents == NULL)
+		goto error_return;
+	      free_contents = contents;
+
+	      if (! bfd_get_section_contents (abfd, sec, contents,
+					      (file_ptr) 0, sec->_raw_size))
+		goto error_return;
+	    }
+	}
+
+      /* Read this BFD's symbols if we haven't done so already.  */
+      if (extsyms == NULL)
+	{
+	  /* Get cached copy if it exists.  */
+	  if (symtab_hdr->contents != NULL)
+	    extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
+	  else
+	    {
+	      /* Go get them off disk.  */
+	      extsyms = ((Elf32_External_Sym *)
+			 bfd_malloc (symtab_hdr->sh_size));
+	      if (extsyms == NULL)
+		goto error_return;
+	      free_extsyms = extsyms;
+	      if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
+		  || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd)
+		      != symtab_hdr->sh_size))
+		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)
+	{
+	  Elf_Internal_Sym isym;
+	  asection *sym_sec;
+
+	  /* A local symbol.  */
+	  bfd_elf32_swap_symbol_in (abfd,
+				    extsyms + ELF32_R_SYM (irel->r_info),
+				    &isym);
+
+	  sym_sec = bfd_section_from_elf_index (abfd, isym.st_shndx);
+	  symval = (isym.st_value
+		    + 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;
+		free_relocs = NULL;
+
+		elf_section_data (sec)->this_hdr.contents = contents;
+		free_contents = NULL;
+
+		symtab_hdr->contents = (bfd_byte *) extsyms;
+		free_extsyms = NULL;
+
+		/* 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.  */
+		if (gap <= 130
+		    && 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_symbol;
+
+		    /* We will need to examine the symbol used by the
+		       previous relocation.  */
+		
+		    bfd_elf32_swap_symbol_in (abfd,
+					      (extsyms + ELF32_R_SYM (last_reloc->r_info)),
+					      &last_symbol);
+
+		    last_sym_sec
+		      = bfd_section_from_elf_index (abfd, last_symbol.st_shndx);
+		    last_value = (last_symbol.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,
+						        extsyms, 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;
+		      }
+		  }
+
+		/* We could not eliminate this jump, so just shorten it.  */
+		code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+		if (code == 0x5e)
+		  bfd_put_8 (abfd, 0x55, contents + irel->r_offset - 1);
+		else if (code == 0x5a)
+		  bfd_put_8 (abfd, 0x40, contents + irel->r_offset - 1);
+		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 16bit pc-relative branch into a 8bit 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;
+	        free_relocs = NULL;
+
+	        elf_section_data (sec)->this_hdr.contents = contents;
+	        free_contents = NULL;
+
+	        symtab_hdr->contents = (bfd_byte *) extsyms;
+	        free_extsyms = NULL;
+
+	        /* Get the opcode.  */
+	        code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+		if (code == 0x58)
+		  {
+		    /* bCC:16 -> bCC:8 */
+		    /* Get the condition code from the original insn.  */
+		    code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+		    code &= 0xf0;
+		    code >>= 4;
+		    code |= 0x40;
+		    bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
+		  }
+		else if (code == 0x5c)
+		  bfd_put_8 (abfd, 0x55, contents + irel->r_offset - 2);
+		else
+		  abort ();
+
+		/* 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 a "mov.b" insn, which may
+	   become an 8 bit absolute address if its in the right range.  */
+	case R_H8_DIR16A8:
+	  {
+	    bfd_vma value = symval + irel->r_addend;
+
+	    if ((bfd_get_mach (abfd) == bfd_mach_h8300
+	         && value >= 0xff00
+	         && value <= 0xffff)
+	        || ((bfd_get_mach (abfd) == bfd_mach_h8300h
+		     || bfd_get_mach (abfd) == bfd_mach_h8300s)
+		    && value >= 0xffff00
+		    && value <= 0xffffff))
+	      {
+	        unsigned char code;
+
+	        /* Note that we've changed the relocs, section contents,
+		   etc.  */
+	        elf_section_data (sec)->relocs = internal_relocs;
+	        free_relocs = NULL;
+
+	        elf_section_data (sec)->this_hdr.contents = contents;
+	        free_contents = NULL;
+
+	        symtab_hdr->contents = (bfd_byte *) extsyms;
+	        free_extsyms = NULL;
+
+	        /* Get the opcode.  */
+	        code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+	        /* Sanity check.  */
+	        if (code != 0x6a)
+		  abort ();
+
+	        code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	        if ((code & 0xf0) == 0x00)
+		  bfd_put_8 (abfd,
+			     (code & 0xf) | 0x20,
+			      contents + irel->r_offset - 2);
+	        else if ((code & 0xf0) == 0x80)
+		  bfd_put_8 (abfd,
+			     (code & 0xf) | 0x30,
+			      contents + irel->r_offset - 2);
+	        else
+		  abort ();
+
+	        /* Fix the relocation's type.  */
+	        irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					     R_H8_DIR8);
+
+	        /* 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 a "mov.b" insn, which may
+	   become an 8 bit absolute address if its in the right range.  */
+	case R_H8_DIR24A8:
+	  {
+	    bfd_vma value = symval + irel->r_addend;
+
+	    if ((bfd_get_mach (abfd) == bfd_mach_h8300
+	         && value >= 0xff00
+	         && value <= 0xffff)
+	        || ((bfd_get_mach (abfd) == bfd_mach_h8300h
+		     || bfd_get_mach (abfd) == bfd_mach_h8300s)
+		    && value >= 0xffff00
+		    && value <= 0xffffff))
+	      {
+	        unsigned char code;
+
+	        /* Note that we've changed the relocs, section contents,
+		   etc.  */
+	        elf_section_data (sec)->relocs = internal_relocs;
+	        free_relocs = NULL;
+
+	        elf_section_data (sec)->this_hdr.contents = contents;
+	        free_contents = NULL;
+
+	        symtab_hdr->contents = (bfd_byte *) extsyms;
+	        free_extsyms = NULL;
+
+	        /* Get the opcode.  */
+	        code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
+
+	        /* Sanity check.  */
+	        if (code != 0x6a)
+		  abort ();
+
+	        code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	        if ((code & 0xf0) == 0x00)
+		  bfd_put_8 (abfd,
+			     (code & 0xf) | 0x20,
+			      contents + irel->r_offset - 2);
+	        else if ((code & 0xf0) == 0x80)
+		  bfd_put_8 (abfd,
+			     (code & 0xf) | 0x30,
+			      contents + irel->r_offset - 2);
+	        else
+		  abort ();
+
+	        /* Fix the relocation's type.  */
+	        irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					     R_H8_DIR8);
+
+	        /* Delete two bytes of data.  */
+	        if (!elf32_h8_relax_delete_bytes (abfd, sec, irel->r_offset, 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;
+	      }
+	  }
+
+	/* FALLTHRU */
+
+	/* This is a 24/32bit absolute address in a "mov" insn, which may
+	   become a 16bit absoulte address if it is in the right range.  */
+	case R_H8_DIR32A16:
+	  {
+	    bfd_vma value = symval + irel->r_addend;
+
+	    if (value <= 0x7fff || value >= 0xff8000)
+	      {
+	        unsigned char code;
+
+	        /* Note that we've changed the relocs, section contents,
+		   etc.  */
+	        elf_section_data (sec)->relocs = internal_relocs;
+	        free_relocs = NULL;
+
+	        elf_section_data (sec)->this_hdr.contents = contents;
+	        free_contents = NULL;
+
+	        symtab_hdr->contents = (bfd_byte *) extsyms;
+	        free_extsyms = NULL;
+
+	        /* Get the opcode.  */
+	        code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
+
+	        /* We just need to turn off bit 0x20.  */
+	        code &= ~0x20;
+
+	        bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
+
+	        /* Fix the relocation's type.  */
+	        irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
+					     R_H8_DIR16A8);
+
+	        /* 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;
+	  }
+
+	default:
+	  break;
+	}
+    }
+
+  if (free_relocs != NULL)
+    {
+      free (free_relocs);
+      free_relocs = NULL;
+    }
+
+  if (free_contents != NULL)
+    {
+      if (! link_info->keep_memory)
+	free (free_contents);
+      else
+	{
+	  /* Cache the section contents for elf_link_input_bfd.  */
+	  elf_section_data (sec)->this_hdr.contents = contents;
+	}
+      free_contents = NULL;
+    }
+
+  if (free_extsyms != NULL)
+    {
+      if (! link_info->keep_memory)
+	free (free_extsyms);
+      else
+	{
+	  /* Cache the symbols for elf_link_input_bfd.  */
+	  symtab_hdr->contents = extsyms;
+	}
+      free_extsyms = NULL;
+    }
+
+  return true;
+
+ error_return:
+  if (free_relocs != NULL)
+    free (free_relocs);
+  if (free_contents != NULL)
+    free (free_contents);
+  if (free_extsyms != NULL)
+    free (free_extsyms);
+  return false;
+}
+
+/* Delete some bytes from a section while relaxing.  */
+
+static boolean
+elf32_h8_relax_delete_bytes (abfd, sec, addr, count)
+     bfd *abfd;
+     asection *sec;
+     bfd_vma addr;
+     int count;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  Elf32_External_Sym *extsyms;
+  int shndx, index;
+  bfd_byte *contents;
+  Elf_Internal_Rela *irel, *irelend;
+  Elf_Internal_Rela *irelalign;
+  bfd_vma toaddr;
+  Elf32_External_Sym *esym, *esymend;
+  struct elf_link_hash_entry *sym_hash;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
+
+  shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  contents = elf_section_data (sec)->this_hdr.contents;
+
+  /* The deletion must stop at the next ALIGN reloc for an aligment
+     power larger than the number of bytes we are deleting.  */
+
+  irelalign = NULL;
+  toaddr = sec->_cooked_size;
+
+  irel = elf_section_data (sec)->relocs;
+  irelend = irel + sec->reloc_count;
+
+  /* Actually delete the bytes.  */
+  memmove (contents + addr, contents + addr + count, toaddr - addr - count);
+  sec->_cooked_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.  */
+  esym = extsyms;
+  esymend = esym + symtab_hdr->sh_info;
+  for (; esym < esymend; esym++)
+    {
+      Elf_Internal_Sym isym;
+
+      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
+
+      if (isym.st_shndx == shndx
+	  && isym.st_value > addr
+	  && isym.st_value < toaddr)
+	{
+	  isym.st_value -= count;
+	  bfd_elf32_swap_symbol_out (abfd, &isym, esym);
+	}
+    }
+
+  /* Now adjust the global symbols defined in this section.  */
+  esym = extsyms + symtab_hdr->sh_info;
+  esymend = extsyms + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym));
+  for (index = 0; esym < esymend; esym++, index++)
+    {
+      Elf_Internal_Sym isym;
+
+      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
+      sym_hash = elf_sym_hashes (abfd)[index];
+      if (isym.st_shndx == shndx
+	  && ((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 boolean
+elf32_h8_symbol_address_p (abfd, sec, extsyms, addr)
+     bfd *abfd;
+     asection *sec;
+     Elf32_External_Sym *extsyms;
+     bfd_vma addr;
+{
+  Elf_Internal_Shdr *symtab_hdr;
+  int shndx;
+  Elf32_External_Sym *esym, *esymend;
+  struct elf_link_hash_entry **sym_hash, **sym_hash_end;
+
+  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
+  shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
+
+  /* Examine all the symbols.  */
+  esym = extsyms;
+  esymend = esym + symtab_hdr->sh_info;
+  for (; esym < esymend; esym++)
+    {
+      Elf_Internal_Sym isym;
+
+      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
+
+      if (isym.st_shndx == shndx
+	  && isym.st_value == addr)
+	return true;
+    }
+
+  sym_hash = elf_sym_hashes (abfd);
+  sym_hash_end = (sym_hash
+		  + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
+		     - symtab_hdr->sh_info));
+  for (; sym_hash < sym_hash_end; sym_hash++)
+    {
+      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 (output_bfd, link_info, link_order,
+					 data, relocateable, symbols)
+     bfd *output_bfd;
+     struct bfd_link_info *link_info;
+     struct bfd_link_order *link_order;
+     bfd_byte *data;
+     boolean relocateable;
+     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;
+  Elf32_External_Sym *external_syms = NULL;
+  Elf_Internal_Sym *internal_syms = NULL;
+
+  /* We only need to handle the case of relaxing, or of having a
+     particular set of section contents, specially.  */
+  if (relocateable
+      || elf_section_data (input_section)->this_hdr.contents == NULL)
+    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
+						       link_order, data,
+						       relocateable,
+						       symbols);
+
+  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
+
+  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
+	  input_section->_raw_size);
+
+  if ((input_section->flags & SEC_RELOC) != 0
+      && input_section->reloc_count > 0)
+    {
+      Elf_Internal_Sym *isymp;
+      asection **secpp;
+      Elf32_External_Sym *esym, *esymend;
+
+      if (symtab_hdr->contents != NULL)
+	external_syms = (Elf32_External_Sym *) symtab_hdr->contents;
+      else
+	{
+	  external_syms = ((Elf32_External_Sym *)
+			   bfd_malloc (symtab_hdr->sh_info
+				       * sizeof (Elf32_External_Sym)));
+	  if (external_syms == NULL && symtab_hdr->sh_info > 0)
+	    goto error_return;
+	  if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
+	      || (bfd_read (external_syms, sizeof (Elf32_External_Sym),
+			    symtab_hdr->sh_info, input_bfd)
+		  != (symtab_hdr->sh_info * sizeof (Elf32_External_Sym))))
+	    goto error_return;
+	}
+
+      internal_relocs = (_bfd_elf32_link_read_relocs
+			 (input_bfd, input_section, (PTR) NULL,
+			  (Elf_Internal_Rela *) NULL, false));
+      if (internal_relocs == NULL)
+	goto error_return;
+
+      internal_syms = ((Elf_Internal_Sym *)
+		       bfd_malloc (symtab_hdr->sh_info
+				   * sizeof (Elf_Internal_Sym)));
+      if (internal_syms == NULL && symtab_hdr->sh_info > 0)
+	goto error_return;
+
+      sections = (asection **) bfd_malloc (symtab_hdr->sh_info
+					   * sizeof (asection *));
+      if (sections == NULL && symtab_hdr->sh_info > 0)
+	goto error_return;
+
+      isymp = internal_syms;
+      secpp = sections;
+      esym = external_syms;
+      esymend = esym + symtab_hdr->sh_info;
+      for (; esym < esymend; ++esym, ++isymp, ++secpp)
+	{
+	  asection *isec;
+
+	  bfd_elf32_swap_symbol_in (input_bfd, esym, isymp);
+
+	  if (isymp->st_shndx == SHN_UNDEF)
+	    isec = bfd_und_section_ptr;
+	  else if (isymp->st_shndx > 0 && isymp->st_shndx < SHN_LORESERVE)
+	    isec = bfd_section_from_elf_index (input_bfd, isymp->st_shndx);
+	  else if (isymp->st_shndx == SHN_ABS)
+	    isec = bfd_abs_section_ptr;
+	  else if (isymp->st_shndx == SHN_COMMON)
+	    isec = bfd_com_section_ptr;
+	  else
+	    {
+	      /* Who knows?  */
+	      isec = NULL;
+	    }
+
+	  *secpp = isec;
+	}
+
+      if (! elf32_h8_relocate_section (output_bfd, link_info, input_bfd,
+				       input_section, data, internal_relocs,
+				       internal_syms, sections))
+	goto error_return;
+
+      if (sections != NULL)
+	free (sections);
+      sections = NULL;
+      if (internal_syms != NULL)
+	free (internal_syms);
+      internal_syms = NULL;
+      if (external_syms != NULL && symtab_hdr->contents == NULL)
+	free (external_syms);
+      external_syms = NULL;
+      if (internal_relocs != elf_section_data (input_section)->relocs)
+	free (internal_relocs);
+      internal_relocs = NULL;
+    }
+
+  return data;
+
+ error_return:
+  if (internal_relocs != NULL
+      && internal_relocs != elf_section_data (input_section)->relocs)
+    free (internal_relocs);
+  if (external_syms != NULL && symtab_hdr->contents == NULL)
+    free (external_syms);
+  if (internal_syms != NULL)
+    free (internal_syms);
+  if (sections != NULL)
+    free (sections);
+  return NULL;
+}
+
 
 #define TARGET_BIG_SYM			bfd_elf32_h8300_vec
 #define TARGET_BIG_NAME			"elf32-h8300"
@@ -678,4 +1532,10 @@ elf32_h8_merge_private_bfd_data (ibfd, obfd)
 /* Use an H8 specific linker, not the ELF generic linker.  */
 #define elf_backend_relocate_section elf32_h8_relocate_section
 
+/* 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
+
+
 #include "elf32-target.h"