* 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.

1 files changed, 6 insertions, 1 deletions

diff --git a/bfd/elflink.h b/bfd/elflink.h
index 2df334b1e48..85160e90257 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);
 	}