diff options
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf-eh-frame.c | 2 | ||||
| -rw-r--r-- | bfd/elflink.h | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a3e243f..1f84b06 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2002-09-23 Alan Modra <amodra@bigpond.net.au> + + * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Zero relocs + for discarded FDEs. Remove redundant assignment. + * elflink.h (elf_bfd_discard_info): Save edited relocs. + 2002-09-22 H.J. Lu <hjl@gnu.org> * elf64-alpha.c (elf64_alpha_merge_ind_symbols): Don't merge diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c index eb4a69b..e80fc6c 100644 --- a/bfd/elf-eh-frame.c +++ b/bfd/elf-eh-frame.c @@ -632,11 +632,11 @@ _bfd_elf_discard_section_eh_frame (abfd, info, sec, ehdrsec, goto free_no_table; if ((*reloc_symbol_deleted_p) (buf - ehbuf, cookie)) { - cookie->rel = rel; /* This is a FDE against discarded section, it should be deleted. */ new_size -= hdr.length + 4; sec_info->entry[sec_info->count].removed = 1; + memset (rel, 0, sizeof (*rel)); } else { diff --git a/bfd/elflink.h b/bfd/elflink.h index 2df334b..85160e9 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -8482,7 +8482,12 @@ elf_bfd_discard_info (output_bfd, info) if (_bfd_elf_discard_section_eh_frame (abfd, info, eh, ehdr, elf_reloc_symbol_deleted_p, &cookie)) - ret = true; + { + /* Relocs have been edited. Ensure edited version is + used later in relocate_section. */ + elf_section_data (eh)->relocs = cookie.rels; + ret = true; + } if (cookie.rels && elf_section_data (eh)->relocs != cookie.rels) free (cookie.rels); } |