diff options
Diffstat (limited to 'bfd/coff-x86_64.c')
| -rw-r--r-- | bfd/coff-x86_64.c | 99 |
1 files changed, 93 insertions, 6 deletions
diff --git a/bfd/coff-x86_64.c b/bfd/coff-x86_64.c index c2da0f4d1ae..e8e16d3ce4b 100644 --- a/bfd/coff-x86_64.c +++ b/bfd/coff-x86_64.c @@ -224,8 +224,10 @@ coff_amd64_reloc (bfd *abfd, static bool in_reloc_p (bfd *abfd ATTRIBUTE_UNUSED, reloc_howto_type *howto) { - return ! howto->pc_relative && howto->type != R_AMD64_IMAGEBASE - && howto->type != R_AMD64_SECREL; + return ! howto->pc_relative + && howto->type != R_AMD64_IMAGEBASE + && howto->type != R_AMD64_SECREL + && howto->type != R_AMD64_SECTION; } #endif /* COFF_WITH_PE */ @@ -356,8 +358,21 @@ static reloc_howto_type howto_table[] = 0xffffffff, /* src_mask */ 0xffffffff, /* dst_mask */ PCRELOFFSET), /* pcrel_offset */ - EMPTY_HOWTO (10), /* R_AMD64_SECTION 10 */ #if defined(COFF_WITH_PE) + /* 16-bit word section relocation (10). */ + HOWTO (R_AMD64_SECTION, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ + 16, /* bitsize */ + false, /* pc_relative */ + 0, /* bitpos */ + complain_overflow_bitfield, /* complain_on_overflow */ + coff_amd64_reloc, /* special_function */ + "IMAGE_REL_AMD64_SECTION", /* name */ + true, /* partial_inplace */ + 0x0000ffff, /* src_mask */ + 0x0000ffff, /* dst_mask */ + true), /* 32-bit longword section relative relocation (11). */ HOWTO (R_AMD64_SECREL, /* type */ 0, /* rightshift */ @@ -373,6 +388,7 @@ static reloc_howto_type howto_table[] = 0xffffffff, /* dst_mask */ true), /* pcrel_offset */ #else + EMPTY_HOWTO (10), EMPTY_HOWTO (11), #endif EMPTY_HOWTO (12), @@ -545,9 +561,9 @@ static reloc_howto_type howto_table[] = #else /* COFF_WITH_PE */ -/* The PE relocate section routine. The only difference between this - and the regular routine is that we don't want to do anything for a - relocatable link. */ +/* The PE relocate section routine. We handle secidx relocations here, + as well as making sure that we don't do anything for a relocatable + link. */ static bool coff_pe_amd64_relocate_section (bfd *output_bfd, @@ -559,9 +575,78 @@ coff_pe_amd64_relocate_section (bfd *output_bfd, struct internal_syment *syms, asection **sections) { + struct internal_reloc *rel; + struct internal_reloc *relend; + if (bfd_link_relocatable (info)) return true; + rel = relocs; + relend = rel + input_section->reloc_count; + + for (; rel < relend; rel++) + { + long symndx; + struct coff_link_hash_entry *h; + asection *sec, *s; + uint16_t idx = 0, i = 1; + + if (rel->r_type != R_SECTION) + continue; + + /* Make sure that _bfd_coff_generic_relocate_section won't parse + this reloc after us. */ + rel->r_type = 0; + + symndx = rel->r_symndx; + + if (symndx < 0 + || (unsigned long) symndx >= obj_raw_syment_count (input_bfd)) + continue; + + h = obj_coff_sym_hashes (input_bfd)[symndx]; + + if (h == NULL) + sec = sections[symndx]; + else + { + if (h->root.type == bfd_link_hash_defined + || h->root.type == bfd_link_hash_defweak) + { + /* Defined weak symbols are a GNU extension. */ + sec = h->root.u.def.section; + } + else + { + sec = NULL; + } + } + + if (!sec) + continue; + + if (bfd_is_abs_section (sec)) + continue; + + if (discarded_section (sec)) + continue; + + s = output_bfd->sections; + while (s) + { + if (s == sec->output_section) + { + idx = i; + break; + } + + i++; + s = s->next; + } + + bfd_putl16 (idx, contents + rel->r_vaddr - input_section->vma); + } + return _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,input_section, contents,relocs, syms, sections); } @@ -716,6 +801,8 @@ coff_amd64_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, bfd_reloc_code_real_ty #if defined(COFF_WITH_PE) case BFD_RELOC_32_SECREL: return howto_table + R_AMD64_SECREL; + case BFD_RELOC_16_SECIDX: + return howto_table + R_AMD64_SECTION; #endif default: BFD_FAIL (); |