From 9e65917652e994b0864b344bfa47014155d93100 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 11 Jan 2017 09:16:44 -0800 Subject: x86-64: Correct unwind info for the BND PLT Since the BND PLT has 230: 68 00 00 00 00 pushq $0x0 235: f2 e9 e5 ff ff ff bnd jmpq 220 <.plt> 23b: 0f 1f 44 00 00 nopl 0x0(%rax,%rax,1) instead of 230: ff 25 e2 0d 20 00 jmpq *0x200de2(%rip) # 201018 236: 68 00 00 00 00 pushq $0x0 23b: e9 e0 ff ff ff jmpq 220 <.plt> its unwind info should be DW_CFA_def_cfa_expression (DW_OP_breg7 (rsp): 8; DW_OP_breg16 (rip): 0; DW_OP_lit15; DW_OP_and; DW_OP_lit5; DW_OP_ge; DW_OP_lit3; DW_OP_shl; DW_OP_plus) bfd/ PR ld/21038 * elf64-x86-64.c (elf_x86_64_eh_frame_bnd_plt): New. (elf_x86_64_bnd_arch_bed): Use elf_x86_64_eh_frame_bnd_plt and elf_x86_64_eh_frame_plt_got. (elf_x86_64_size_dynamic_sections): Get unwind info from elf_x86_64_bnd_arch_bed for the BND PLT. ld/ PR ld/21038 * testsuite/ld-x86-64/pr21038a.d: New file. * testsuite/ld-x86-64/pr21038a.s: Likewise. * testsuite/ld-x86-64/pr21038b.d: Likewise. * testsuite/ld-x86-64/pr21038b.s: Likewise. * testsuite/ld-x86-64/x86-64.exp: Run pr21038a and pr21038b. --- ld/ChangeLog | 9 +++++ ld/testsuite/ld-x86-64/pr21038a.d | 71 +++++++++++++++++++++++++++++++++++++++ ld/testsuite/ld-x86-64/pr21038a.s | 8 +++++ ld/testsuite/ld-x86-64/pr21038b.d | 64 +++++++++++++++++++++++++++++++++++ ld/testsuite/ld-x86-64/pr21038b.s | 7 ++++ ld/testsuite/ld-x86-64/x86-64.exp | 2 ++ 6 files changed, 161 insertions(+) create mode 100644 ld/testsuite/ld-x86-64/pr21038a.d create mode 100644 ld/testsuite/ld-x86-64/pr21038a.s create mode 100644 ld/testsuite/ld-x86-64/pr21038b.d create mode 100644 ld/testsuite/ld-x86-64/pr21038b.s (limited to 'ld') diff --git a/ld/ChangeLog b/ld/ChangeLog index 0a72581..79bcc5f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,12 @@ +2017-01-11 H.J. Lu + + PR ld/21038 + * testsuite/ld-x86-64/pr21038a.d: New file. + * testsuite/ld-x86-64/pr21038a.s: Likewise. + * testsuite/ld-x86-64/pr21038b.d: Likewise. + * testsuite/ld-x86-64/pr21038b.s: Likewise. + * testsuite/ld-x86-64/x86-64.exp: Run pr21038a and pr21038b. + 2017-01-11 Jeremy Soller * configure.tgt: Add entries for x86-redox and x86_64-redox. diff --git a/ld/testsuite/ld-x86-64/pr21038a.d b/ld/testsuite/ld-x86-64/pr21038a.d new file mode 100644 index 0000000..f2f88eb --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr21038a.d @@ -0,0 +1,71 @@ +#name: PR ld/21038 (.plt.got) +#as: --64 +#ld: -z bndplt -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_lit5; 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]+: f2 ff 25 e3 0d 20 00 bnd jmpq \*0x200de3\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) + +Disassembly of section .plt.got: + +0+230 <.plt.got>: + +[a-f0-9]+: f2 ff 25 c1 0d 20 00 bnd jmpq \*0x200dc1\(%rip\) # 200ff8 + +[a-f0-9]+: 90 nop + +Disassembly of section .text: + +0+238 : + +[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 +#pass diff --git a/ld/testsuite/ld-x86-64/pr21038a.s b/ld/testsuite/ld-x86-64/pr21038a.s new file mode 100644 index 0000000..d9a1b4c --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr21038a.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/pr21038b.d b/ld/testsuite/ld-x86-64/pr21038b.d new file mode 100644 index 0000000..1690d1e --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr21038b.d @@ -0,0 +1,64 @@ +#name: PR ld/21038 (.plt.bnd) +#as: --64 +#ld: -z bndplt -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=0000000000000248..000000000000024d + 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..0000000000000240 + 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_lit5; DW_OP_ge; DW_OP_lit3; DW_OP_shl; DW_OP_plus\) + 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]+: f2 ff 25 e3 0d 20 00 bnd jmpq \*0x200de3\(%rip\) # 201010 <_GLOBAL_OFFSET_TABLE_\+0x10> + +[a-f0-9]+: 0f 1f 00 nopl \(%rax\) + +[a-f0-9]+: 68 00 00 00 00 pushq \$0x0 + +[a-f0-9]+: f2 e9 e5 ff ff ff bnd jmpq 220 <.plt> + +[a-f0-9]+: 0f 1f 44 00 00 nopl 0x0\(%rax,%rax,1\) + +Disassembly of section .plt.bnd: + +0+240 : + +[a-f0-9]+: f2 ff 25 d1 0d 20 00 bnd jmpq \*0x200dd1\(%rip\) # 201018 + +[a-f0-9]+: 90 nop + +Disassembly of section .text: + +0+248 : + +[a-f0-9]+: e8 f3 ff ff ff callq 240 +#pass diff --git a/ld/testsuite/ld-x86-64/pr21038b.s b/ld/testsuite/ld-x86-64/pr21038b.s new file mode 100644 index 0000000..3a8fc47 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr21038b.s @@ -0,0 +1,7 @@ + .text + .globl foo + .type foo, @function +foo: + .cfi_startproc + call func@plt + .cfi_endproc diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index f6b18bd..ff782a0 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -1021,3 +1021,5 @@ run_dump_test "pltgot-1" run_dump_test "pltgot-2" run_dump_test "pr20830a" run_dump_test "pr20830b" +run_dump_test "pr21038a" +run_dump_test "pr21038b" -- cgit v1.1