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 /ld | |
| 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 'ld')
| -rw-r--r-- | ld/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr19013-nacl.d | 9 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr19013-x32.d | 9 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr19013.d | 8 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr19013.s | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/x86-64.exp | 3 |
6 files changed, 43 insertions, 0 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index 40eb358..7f1b7ac 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2015-09-30 H.J. Lu <hongjiu.lu@intel.com> + + 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. + 2015-09-29 H.J. Lu <hongjiu.lu@intel.com> PR binutils/19005 diff --git a/ld/testsuite/ld-x86-64/pr19013-nacl.d b/ld/testsuite/ld-x86-64/pr19013-nacl.d new file mode 100644 index 0000000..7294ed2 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr19013-nacl.d @@ -0,0 +1,9 @@ +#source: pr19013.s +#as: --x32 +#ld: --oformat elf32-i386-nacl +#objdump: -s -j .rodata +#target: x86_64-*-nacl* + +#... + [0-9a-f]+ 00000203 00414243 4400 +.....ABCD. + +#pass diff --git a/ld/testsuite/ld-x86-64/pr19013-x32.d b/ld/testsuite/ld-x86-64/pr19013-x32.d new file mode 100644 index 0000000..fb70966 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr19013-x32.d @@ -0,0 +1,9 @@ +#source: pr19013.s +#as: --x32 +#ld: --oformat elf32-i386 -m elf32_x86_64 +#objdump: -s -j .rodata +#notarget: x86_64-*-nacl* + +#... + [0-9a-f]+ 00000203 00414243 4400 +.....ABCD. + +#pass diff --git a/ld/testsuite/ld-x86-64/pr19013.d b/ld/testsuite/ld-x86-64/pr19013.d new file mode 100644 index 0000000..9b1473a --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr19013.d @@ -0,0 +1,8 @@ +#as: --64 +#ld: --oformat elf32-i386 +#objdump: -s -j .rodata +#notarget: x86_64-*-nacl* + +#... + [0-9a-f]+ 00000203 00414243 4400 +.....ABCD. + +#pass diff --git a/ld/testsuite/ld-x86-64/pr19013.s b/ld/testsuite/ld-x86-64/pr19013.s new file mode 100644 index 0000000..db95ecb --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr19013.s @@ -0,0 +1,5 @@ + .section .rodata.str1.1,"aMS",@progbits,1 + .globl _start +_start: + .byte 0x0, 0x0, 0x2, 0x3, 0x0 + .string "ABCD" diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 6320999..5de67ca 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -327,6 +327,9 @@ run_dump_test "pr18160" run_dump_test "pr18176" run_dump_test "pr18801" run_dump_test "pr18815" +run_dump_test "pr19013" +run_dump_test "pr19013-x32" +run_dump_test "pr19013-nacl" # Add $PLT_CFLAGS if PLT is expected. global PLT_CFLAGS |