Also check e_machine when merging sections

[deliverable/binutils-gdb.git] / bfd / ChangeLog

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f4ca2ec55f27a7b293cb12431345671a01e40310..a218d44483db64f09827c63fcc292daa7a865dce 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/19013
+       * elflink.c (_bfd_elf_merge_sections): Only merge input bfds
+       that have the compatible ELF machine code with the output bfd.
+
 2015-09-30  Alan Modra  <amodra@gmail.com>
 
        PR ld/19013