diff options
| author | Alan Modra <amodra@gmail.com> | 2014-09-22 17:49:17 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2014-09-22 18:50:13 +0930 |
| commit | aa8f4d1e5e6c01420489a2dfba72495bbd8489be (patch) | |
| tree | b234f269c5749ddc47c53b5327292aec2d485818 /bfd | |
| parent | a25a5a45ef9340eb9a435f9b70599a90bb142658 (diff) | |
| download | gdb-aa8f4d1e5e6c01420489a2dfba72495bbd8489be.zip gdb-aa8f4d1e5e6c01420489a2dfba72495bbd8489be.tar.gz gdb-aa8f4d1e5e6c01420489a2dfba72495bbd8489be.tar.bz2 | |
Produce output file with -noinhibit-exec after overlapping FDE error
* elf-eh-frame (_bfd_elf_write_section_eh_frame_hdr): Don't return
false for overflow or overlapping FDEs. Give more detail in
error messages.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf-eh-frame.c | 28 |
2 files changed, 17 insertions, 17 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b817554..2fc0e1e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2014-09-22 Alan Modra <amodra@gmail.com> + + * elf-eh-frame.c (_bfd_elf_write_section_eh_frame_hdr): Don't return + false for overflow or overlapping FDEs. Give more detail in + error messages. + 2014-09-22 Andrew Bennett <andrew.bennett@imgtec.com> * elfxx-mips.c (mips_elf_calculate_relocation): Don't sign extend diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c index 02f2d23..b32add3 100644 --- a/bfd/elf-eh-frame.c +++ b/bfd/elf-eh-frame.c @@ -1807,13 +1807,10 @@ _bfd_elf_write_section_eh_frame_hdr (bfd *abfd, struct bfd_link_info *info) if (contents[2] != DW_EH_PE_omit) { unsigned int i; - bfd_boolean overlap, overflow; bfd_put_32 (abfd, hdr_info->fde_count, contents + EH_FRAME_HDR_SIZE); qsort (hdr_info->array, hdr_info->fde_count, sizeof (*hdr_info->array), vma_compare); - overlap = FALSE; - overflow = FALSE; for (i = 0; i < hdr_info->fde_count; i++) { bfd_vma val; @@ -1823,31 +1820,28 @@ _bfd_elf_write_section_eh_frame_hdr (bfd *abfd, struct bfd_link_info *info) if (elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS64 && (hdr_info->array[i].initial_loc != sec->output_section->vma + val)) - overflow = TRUE; + (*info->callbacks->einfo) + (_("%X%P: .eh_frame_hdr table[%u] pc overflow.\n"), i); bfd_put_32 (abfd, val, contents + EH_FRAME_HDR_SIZE + i * 8 + 4); + val = hdr_info->array[i].fde - sec->output_section->vma; val = ((val & 0xffffffff) ^ 0x80000000) - 0x80000000; if (elf_elfheader (abfd)->e_ident[EI_CLASS] == ELFCLASS64 && (hdr_info->array[i].fde != sec->output_section->vma + val)) - overflow = TRUE; + (*info->callbacks->einfo) + (_("%X%P: .eh_frame_hdr table[%u] fde overflow.\n"), i); bfd_put_32 (abfd, val, contents + EH_FRAME_HDR_SIZE + i * 8 + 8); + if (i != 0 && (hdr_info->array[i].initial_loc < (hdr_info->array[i - 1].initial_loc + hdr_info->array[i - 1].range))) - overlap = TRUE; - } - if (overflow) - (*info->callbacks->einfo) - (_("%P: .eh_frame_hdr entry overflow.\n")); - if (overlap) - (*info->callbacks->einfo) - (_("%P: .eh_frame_hdr refers to overlapping FDEs.\n")); - if (overflow || overlap) - { - bfd_set_error (bfd_error_bad_value); - retval = FALSE; + (*info->callbacks->einfo) + (_("%X%P: .eh_frame_hdr table[%u] FDE at %V overlaps " + "table[%u] FDE at %V.\n"), + i - 1, hdr_info->array[i - 1].fde, + i, hdr_info->array[i].fde); } } |