From 9da84788daafe295573bb29bb85616086abc0c2c Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 16 Oct 2003 21:04:04 +0000 Subject: [PATCH] 2003-10-16 H.J. Lu * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't use the last CIE from a different section. (_bfd_elf_write_section_eh_frame): Don't pad beyond the raw size of the output section. --- bfd/ChangeLog | 7 +++++++ bfd/elf-eh-frame.c | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b96d322e892..337c7c8c7a5 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2003-10-16 H.J. Lu + + * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Don't + use the last CIE from a different section. + (_bfd_elf_write_section_eh_frame): Don't pad beyond the raw + size of the output section. + 2003-10-07 Roland McGrath * elf.c (_bfd_elf_make_section_from_phdr): Set alignment_power of diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c index c2f6b961a13..28e0b55fefd 100644 --- a/bfd/elf-eh-frame.c +++ b/bfd/elf-eh-frame.c @@ -372,6 +372,9 @@ _bfd_elf_discard_section_eh_frame all FDEs. Also, it can be removed if we have removed all FDEs using it. */ if ((!info->relocatable + && hdr_info->last_cie_sec + && (sec->output_section + == hdr_info->last_cie_sec->output_section) && cie_compare (&cie, &hdr_info->last_cie) == 0) || cie_usage_count == 0) { @@ -1031,7 +1034,11 @@ _bfd_elf_write_section_eh_frame (bfd *abfd, unsigned int alignment = 1 << sec->alignment_power; unsigned int pad = sec->_cooked_size % alignment; - if (pad) + /* Don't pad beyond the raw size of the output section. It + can happen at the last input section. */ + if (pad + && ((sec->output_offset + sec->_cooked_size + pad) + <= sec->output_section->_raw_size)) { /* Find the last CIE/FDE. */ for (i = sec_info->count - 1; i > 0; i--) -- 2.30.2