diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-09-30 05:32:12 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-09-30 05:37:49 -0700 |
| commit | 9865bd0da6e59c3a1c55605b5a6a9283ed4d542c (patch) | |
| tree | 00cfc33b4e09eef4d71758d73f7fc0555ac04d73 /bfd/ChangeLog | |
| parent | 2ec6d9e621ca468d56ac92df8ec2ec510d21f6da (diff) | |
| download | gdb-9865bd0da6e59c3a1c55605b5a6a9283ed4d542c.zip gdb-9865bd0da6e59c3a1c55605b5a6a9283ed4d542c.tar.gz gdb-9865bd0da6e59c3a1c55605b5a6a9283ed4d542c.tar.bz2 | |
Also check e_machine when merging sections
When we check consistency for merge ELF sections, we should not only
check EI_CLASS, but also compatible e_machine.
bfd/
PR ld/19013
* elflink.c (_bfd_elf_merge_sections): Only merge input bfds
that have the compatible ELF machine code with the output bfd.
ld/testsuite/
PR ld/19013
* ld-x86-64/pr19013-nacl.d: New file.
* ld-x86-64/pr19013-x32.d: Likewise.
* ld-x86-64/pr19013.d: Likewise.
* ld-x86-64/pr19013.s: Likewise.
* ld-x86-64/x86-64.exp: Run PR ld/19013 tests.
Diffstat (limited to 'bfd/ChangeLog')
| -rw-r--r-- | bfd/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f4ca2ec..a218d44 100644 --- 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 |