Add some string section merging support.

* elf64-sh64.c (sh_elf64_relocate_section): Call
	_bfd_elf_rela_local_sym.  Handle relocs against STT_SECTION symbol
	of SHF_MERGE section.
This commit is contained in:
Jim Wilson 2002-10-25 18:55:22 +00:00
parent 1f2baacc1f
commit a0087177c3
2 changed files with 35 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2002-10-25 Jim Wilson <wilson@redhat.com>
* elf64-sh64.c (sh_elf64_relocate_section): Call
_bfd_elf_rela_local_sym. Handle relocs against STT_SECTION symbol
of SHF_MERGE section.
2002-10-25 Hans-Peter Nilsson <hp@axis.com>
* simple.c: Correct placement of ATTRIBUTE_UNUSED.

View File

@ -1588,6 +1588,35 @@ sh_elf64_relocate_section (output_bfd, info, input_bfd, input_section,
continue;
}
else if (! howto->partial_inplace)
{
relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sec, rel);
relocation |= ((sym->st_other & STO_SH5_ISA32) != 0);
}
else if ((sec->flags & SEC_MERGE)
&& ELF_ST_TYPE (sym->st_info) == STT_SECTION)
{
asection *msec;
if (howto->rightshift || howto->src_mask != 0xffffffff)
{
(*_bfd_error_handler)
(_("%s(%s+0x%lx): %s relocation against SEC_MERGE section"),
bfd_archive_filename (input_bfd),
bfd_get_section_name (input_bfd, input_section),
(long) rel->r_offset, howto->name);
return false;
}
addend = bfd_get_32 (input_bfd, contents + rel->r_offset);
msec = sec;
addend =
_bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend)
- relocation;
addend += msec->output_section->vma + msec->output_offset;
bfd_put_32 (input_bfd, addend, contents + rel->r_offset);
addend = 0;
}
}
else
{