2010-03-31 Kai Tietz <kai.tietz@onevision.com>

* coff-i386.c (in_reloc_p): Check also for R_SECREL32.
        * coff-x86_64.c (in_reloc_p): Check also for R_AMD64_SECREL.
This commit is contained in:
Kai Tietz 2010-03-31 16:32:02 +00:00
parent 2ae2a0b7f1
commit b706dc83c1
3 changed files with 13 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2010-03-31 Kai Tietz <kai.tietz@onevision.com>
* coff-i386.c (in_reloc_p): Check also for R_SECREL32.
* coff-x86_64.c (in_reloc_p): Check also for R_AMD64_SECREL.
2010-03-31 Alan Modra <amodra@gmail.com>
* elf64-ppc.c (ppc64_elf_relocate_section): Nop out optimized

View File

@ -195,7 +195,8 @@ static bfd_boolean in_reloc_p (abfd, howto)
bfd * abfd ATTRIBUTE_UNUSED;
reloc_howto_type *howto;
{
return ! howto->pc_relative && howto->type != R_IMAGEBASE;
return ! howto->pc_relative && howto->type != R_IMAGEBASE
&& howto->type != R_SECREL32;
}
#endif /* COFF_WITH_PE */

View File

@ -192,7 +192,8 @@ coff_amd64_reloc (bfd *abfd,
static bfd_boolean
in_reloc_p (bfd *abfd ATTRIBUTE_UNUSED, reloc_howto_type *howto)
{
return ! howto->pc_relative && howto->type != R_AMD64_IMAGEBASE;
return ! howto->pc_relative && howto->type != R_AMD64_IMAGEBASE
&& howto->type != R_AMD64_SECREL;
}
#endif /* COFF_WITH_PE */
@ -555,10 +556,10 @@ coff_amd64_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
#if defined(COFF_WITH_PE)
/* Cancel out code in _bfd_coff_generic_relocate_section. */
*addendp = 0;
if (rel->r_type >= R_AMD64_PCRLONG_1 && rel->r_type <= R_AMD64_PCRLONG_5)
{
*addendp -= (bfd_vma)(rel->r_type - R_AMD64_PCRLONG);
rel->r_type = R_AMD64_PCRLONG;
if (rel->r_type >= R_AMD64_PCRLONG_1 && rel->r_type <= R_AMD64_PCRLONG_5)
{
*addendp -= (bfd_vma)(rel->r_type - R_AMD64_PCRLONG);
rel->r_type = R_AMD64_PCRLONG;
}
#endif