diff options
Diffstat (limited to 'ld')
| -rw-r--r-- | ld/ChangeLog | 26 | ||||
| -rw-r--r-- | ld/emulparams/elf32_x86_64.sh | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/i386.exp | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/pr20830.d | 60 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/pr20830.s | 8 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr20830.s | 8 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr20830a.d | 72 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr20830b.d | 60 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/x86-64.exp | 2 |
9 files changed, 241 insertions, 0 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index 6a61d61..03562de 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,29 @@ +2017-01-13 H.J. Lu <hongjiu.lu@intel.com> + + Backport from master + 2017-01-10 H.J. Lu <hongjiu.lu@intel.com> + + * testsuite/ld-x86-64/pr20830b.d: Updated. + + 2017-01-10 H.J. Lu <hongjiu.lu@intel.com> + + * emulparams/elf32_x86_64.sh (TINY_READONLY_SECTION): New. + * testsuite/ld-x86-64/pr20830.d: Renamed to ... + * testsuite/ld-x86-64/pr20830a.d: This. Updated. + * testsuite/ld-x86-64/pr20830b.d: New file. + * testsuite/ld-x86-64/x86-64.exp: Rename pr20830 to pr20830a. + Run pr20830b. + + 2017-01-10 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/20830 + * testsuite/ld-i386/i386.exp: Run pr20830. + * testsuite/ld-x86-64/x86-64.exp: Likewise. + * testsuite/ld-i386/pr20830.d: New file. + * testsuite/ld-i386/pr20830.s: Likewise. + * testsuite/ld-x86-64/pr20830.d: Likewise. + * testsuite/ld-x86-64/pr20830.s: Likewise. + 2017-01-02 Alan Modra <amodra@gmail.com> Update year range in copyright notice of all files. diff --git a/ld/emulparams/elf32_x86_64.sh b/ld/emulparams/elf32_x86_64.sh index 9050730..9b85239 100644 --- a/ld/emulparams/elf32_x86_64.sh +++ b/ld/emulparams/elf32_x86_64.sh @@ -21,6 +21,10 @@ LARGE_SECTIONS=yes LARGE_BSS_AFTER_BSS= SEPARATE_GOTPLT="SIZEOF (.got.plt) >= 24 ? 24 : 0" IREL_IN_PLT= +# Reuse TINY_READONLY_SECTION which is placed right after .plt section. +TINY_READONLY_SECTION=" +.plt.got ${RELOCATING-0} : { *(.plt.got) } +" if [ "x${host}" = "x${target}" ]; then case " $EMULATION_LIBPATH " in diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index e748e8b..f439411 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -864,3 +864,4 @@ if { !([istarget "i?86-*-linux*"] # Linux only tests run_dump_test "pltgot-1" run_dump_test "pltgot-2" +run_dump_test "pr20830" diff --git a/ld/testsuite/ld-i386/pr20830.d b/ld/testsuite/ld-i386/pr20830.d new file mode 100644 index 0000000..caaadd7 --- /dev/null +++ b/ld/testsuite/ld-i386/pr20830.d @@ -0,0 +1,60 @@ +#name: PR ld/20830 (.plt.got) +#as: --32 +#ld: -melf_i386 -shared -z relro --ld-generated-unwind-info +#objdump: -dw -Wf + +.*: +file format .* + +Contents of the .eh_frame section: + +0+ 00000014 00000000 CIE + Version: 1 + Augmentation: "zR" + Code alignment factor: 1 + Data alignment factor: -4 + Return address column: 8 + Augmentation data: 1b + + DW_CFA_def_cfa: r4 \(esp\) ofs 4 + DW_CFA_offset: r8 \(eip\) at cfa-4 + DW_CFA_nop + DW_CFA_nop + +0+18 00000010 0000001c FDE cie=00000000 pc=00000188..00000193 + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + +0+2c 00000020 00000030 FDE cie=00000000 pc=00000170..00000180 + DW_CFA_def_cfa_offset: 8 + DW_CFA_advance_loc: 6 to 00000176 + DW_CFA_def_cfa_offset: 12 + DW_CFA_advance_loc: 10 to 00000180 + DW_CFA_def_cfa_expression \(DW_OP_breg4 \(esp\): 4; DW_OP_breg8 \(eip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit11; DW_OP_ge; DW_OP_lit2; DW_OP_shl; DW_OP_plus\) + +0+50 00000010 00000054 FDE cie=00000000 pc=00000180..00000188 + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + + +Disassembly of section .plt: + +0+170 <.plt>: + +[a-f0-9]+: ff b3 04 00 00 00 pushl 0x4\(%ebx\) + +[a-f0-9]+: ff a3 08 00 00 00 jmp \*0x8\(%ebx\) + +[a-f0-9]+: 00 00 add %al,\(%eax\) + ... + +Disassembly of section .plt.got: + +0+180 <.plt.got>: + +[a-f0-9]+: ff a3 fc ff ff ff jmp \*-0x4\(%ebx\) + +[a-f0-9]+: 66 90 xchg %ax,%ax + +Disassembly of section .text: + +0+188 <foo>: + +[a-f0-9]+: e8 f3 ff ff ff call 180 <.plt.got> + +[a-f0-9]+: 8b 83 fc ff ff ff mov -0x4\(%ebx\),%eax +#pass diff --git a/ld/testsuite/ld-i386/pr20830.s b/ld/testsuite/ld-i386/pr20830.s new file mode 100644 index 0000000..344a137 --- /dev/null +++ b/ld/testsuite/ld-i386/pr20830.s @@ -0,0 +1,8 @@ + .text + .globl foo + .type foo, @function +foo: + .cfi_startproc + call func@plt + movl func@GOT(%ebx), %eax + .cfi_endproc diff --git a/ld/testsuite/ld-x86-64/pr20830.s b/ld/testsuite/ld-x86-64/pr20830.s new file mode 100644 index 0000000..d9a1b4c --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20830.s @@ -0,0 +1,8 @@ + .text + .globl foo + .type foo, @function +foo: + .cfi_startproc + call func@plt + movq func@GOTPCREL(%rip), %rax + .cfi_endproc diff --git a/ld/testsuite/ld-x86-64/pr20830a.d b/ld/testsuite/ld-x86-64/pr20830a.d new file mode 100644 index 0000000..87ea25d --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20830a.d @@ -0,0 +1,72 @@ +#name: PR ld/20830 (.plt.got) +#source: pr20830.s +#as: --64 +#ld: -melf_x86_64 -shared -z relro --ld-generated-unwind-info +#objdump: -dw -Wf + +.*: +file format .* + +Contents of the .eh_frame section: + +0+ 0000000000000014 00000000 CIE + Version: 1 + Augmentation: "zR" + Code alignment factor: 1 + Data alignment factor: -8 + Return address column: 16 + Augmentation data: 1b + + DW_CFA_def_cfa: r7 \(rsp\) ofs 8 + DW_CFA_offset: r16 \(rip\) at cfa-8 + DW_CFA_nop + DW_CFA_nop + +0+18 0000000000000014 0000001c FDE cie=00000000 pc=0000000000000238..0000000000000244 + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + +0+30 0000000000000024 00000034 FDE cie=00000000 pc=0000000000000220..0000000000000230 + DW_CFA_def_cfa_offset: 16 + DW_CFA_advance_loc: 6 to 0000000000000226 + DW_CFA_def_cfa_offset: 24 + DW_CFA_advance_loc: 10 to 0000000000000230 + DW_CFA_def_cfa_expression \(DW_OP_breg7 \(rsp\): 8; DW_OP_breg16 \(rip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit11; DW_OP_ge; DW_OP_lit3; DW_OP_shl; DW_OP_plus\) + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + +0+58 0000000000000014 0000005c FDE cie=00000000 pc=0000000000000230..0000000000000238 + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + + +Disassembly of section .plt: + +0+220 <.plt>: + +[a-f0-9]+: ff 35 e2 0d 20 00 pushq 0x200de2\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 e4 0d 20 00 jmpq \*0x200de4\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) + +Disassembly of section .plt.got: + +0+230 <.plt.got>: + +[a-f0-9]+: ff 25 c2 0d 20 00 jmpq \*0x200dc2\(%rip\) # 200ff8 <func> + +[a-f0-9]+: 66 90 xchg %ax,%ax + +Disassembly of section .text: + +0+238 <foo>: + +[a-f0-9]+: e8 f3 ff ff ff callq 230 <.plt.got> + +[a-f0-9]+: 48 8b 05 b4 0d 20 00 mov 0x200db4\(%rip\),%rax # 200ff8 <func> +#pass diff --git a/ld/testsuite/ld-x86-64/pr20830b.d b/ld/testsuite/ld-x86-64/pr20830b.d new file mode 100644 index 0000000..218a56e --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20830b.d @@ -0,0 +1,60 @@ +#name: PR ld/20830 (.plt.got) +#source: pr20830.s +#as: --x32 +#ld: -melf32_x86_64 -shared -z relro --ld-generated-unwind-info +#objdump: -dw -Wf + +.*: +file format .* + +Contents of the .eh_frame section: + +0+ 0000000000000014 00000000 CIE + Version: 1 + Augmentation: "zR" + Code alignment factor: 1 + Data alignment factor: -8 + Return address column: 16 + Augmentation data: 1b + + DW_CFA_def_cfa: r7 \(rsp\) ofs 8 + DW_CFA_offset: r16 \(rip\) at cfa-8 + DW_CFA_nop + DW_CFA_nop + +0+18 0000000000000010 0000001c FDE cie=00000000 pc=0000000000000188..0000000000000194 + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + +0+2c 0000000000000020 00000030 FDE cie=00000000 pc=0000000000000170..0000000000000180 + DW_CFA_def_cfa_offset: 16 + DW_CFA_advance_loc: 6 to 0000000000000176 + DW_CFA_def_cfa_offset: 24 + DW_CFA_advance_loc: 10 to 0000000000000180 + DW_CFA_def_cfa_expression \(DW_OP_breg7 \(rsp\): 8; DW_OP_breg16 \(rip\): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit11; DW_OP_ge; DW_OP_lit3; DW_OP_shl; DW_OP_plus\) + +0+50 0000000000000010 00000054 FDE cie=00000000 pc=0000000000000180..0000000000000188 + DW_CFA_nop + DW_CFA_nop + DW_CFA_nop + + +Disassembly of section .plt: + +0+170 <.plt>: + +[a-f0-9]+: ff 35 92 0e 20 00 pushq 0x200e92\(%rip\) # 201008 <_GLOBAL_OFFSET_TABLE_\+0x8> + +[a-f0-9]+: ff 25 94 0e 20 00 jmpq \*0x200e94\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: 0f 1f 40 00 nopl 0x0\(%rax\) + +Disassembly of section .plt.got: + +0+180 <.plt.got>: + +[a-f0-9]+: ff 25 72 0e 20 00 jmpq \*0x200e72\(%rip\) # 200ff8 <func> + +[a-f0-9]+: 66 90 xchg %ax,%ax + +Disassembly of section .text: + +0+188 <foo>: + +[a-f0-9]+: e8 f3 ff ff ff callq 180 <.plt.got> + +[a-f0-9]+: 48 8b 05 64 0e 20 00 mov 0x200e64\(%rip\),%rax # 200ff8 <func> +#pass diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index ac63a1d..3a7ba38 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -1017,3 +1017,5 @@ if { ![istarget "x86_64-*-linux*"]} { run_dump_test "pr17618" run_dump_test "pltgot-1" run_dump_test "pltgot-2" +run_dump_test "pr20830a" +run_dump_test "pr20830b" |