diff options
Diffstat (limited to 'ld')
83 files changed, 1342 insertions, 115 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog index cd5f4e3..09de0c7 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,94 @@ +2016-06-18 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/20253 + * testsuite/ld-i386/i386.exp: Run PR ld/20253 tests. + * testsuite/ld-i386/no-plt.exp: Likewise. + * testsuite/ld-x86-64/no-plt.exp: Likewise. + * testsuite/ld-i386/pr13302.d: Remove .rel.plt section. + * testsuite/ld-ifunc/ifunc-13-i386.d: Likewise. + * testsuite/ld-ifunc/ifunc-13-x86-64.d: Likewise. + * testsuite/ld-ifunc/ifunc-15-i386.d: Likewise. + * testsuite/ld-ifunc/ifunc-15-x86-64.d: Likewise. + * testsuite/ld-x86-64/pr13082-5a.d: Likewise. + * testsuite/ld-x86-64/pr13082-5b.d: Likewise. + * testsuite/ld-x86-64/pr13082-6a.d: Likewise. + * testsuite/ld-x86-64/pr13082-6b.d: Likewise. + * testsuite/ld-i386/pr20244-2a.d: Remove .plt section. + * testsuite/ld-ifunc/ifunc-21-i386.d: Likewise. + * testsuite/ld-ifunc/ifunc-21-x86-64.d: Likewise. + * testsuite/ld-ifunc/ifunc-22-i386.d: Likewise. + * testsuite/ld-ifunc/ifunc-22-x86-64.d: Likewise. + * testsuite/ld-i386/pr20244-2b.d: Updated. + * testsuite/ld-i386/pr20244-2c.d: Likewise. + * testsuite/ld-ifunc/ifunc-18a-i386.d: Likewise. + * testsuite/ld-ifunc/ifunc-18a-x86-64.d: Likewise. + * testsuite/ld-ifunc/ifunc-18b-i386.d: Likewise. + * testsuite/ld-ifunc/ifunc-18b-x86-64.d: Likewise. + * testsuite/ld-i386/pr20253-1a.c: New file. + * testsuite/ld-i386/pr20253-1b.S: Likewise. + * testsuite/ld-i386/pr20253-1c.S: Likewise. + * testsuite/ld-i386/pr20253-1d.S: Likewise. + * testsuite/ld-i386/pr20253-2a.c: Likewise. + * testsuite/ld-i386/pr20253-2b.S: Likewise. + * testsuite/ld-i386/pr20253-2c.S: Likewise. + * testsuite/ld-i386/pr20253-2d.S: Likewise. + * testsuite/ld-i386/pr20253-3.d: Likewise. + * testsuite/ld-i386/pr20253-3.s: Likewise. + * testsuite/ld-i386/pr20253-4.s: Likewise. + * testsuite/ld-i386/pr20253-4a.d: Likewise. + * testsuite/ld-i386/pr20253-4b.d: Likewise. + * testsuite/ld-i386/pr20253-4c.d: Likewise. + * testsuite/ld-i386/pr20253-5.d: Likewise. + * testsuite/ld-i386/pr20253-5.s: Likewise. + * testsuite/ld-ifunc/ifunc-23-x86.s: Likewise. + * testsuite/ld-ifunc/ifunc-23a-x86.d: Likewise. + * testsuite/ld-ifunc/ifunc-23b-x86.d: Likewise. + * testsuite/ld-ifunc/ifunc-23c-x86.d: Likewise. + * testsuite/ld-ifunc/ifunc-24-x86.s: Likewise. + * testsuite/ld-ifunc/ifunc-24a-x86.d: Likewise. + * testsuite/ld-ifunc/ifunc-24b-x86.d: Likewise. + * testsuite/ld-ifunc/ifunc-24c-x86.d: Likewise. + * testsuite/ld-ifunc/ifunc-25-x86.s: Likewise. + * testsuite/ld-ifunc/ifunc-25a-x86.d: Likewise. + * testsuite/ld-ifunc/ifunc-25b-x86.d: Likewise. + * testsuite/ld-ifunc/ifunc-25c-x86.d: Likewise. + * testsuite/ld-x86-64/pr20253-1.s: Likewise. + * testsuite/ld-x86-64/pr20253-1a.d: Likewise. + * testsuite/ld-x86-64/pr20253-1b.d: Likewise. + * testsuite/ld-x86-64/pr20253-1c.d: Likewise. + * testsuite/ld-x86-64/pr20253-1d.d: Likewise. + * testsuite/ld-x86-64/pr20253-1e.d: Likewise. + * testsuite/ld-x86-64/pr20253-1f.d: Likewise. + * testsuite/ld-x86-64/pr20253-1g.d: Likewise. + * testsuite/ld-x86-64/pr20253-1h.d: Likewise. + * testsuite/ld-x86-64/pr20253-1i.d: Likewise. + * testsuite/ld-x86-64/pr20253-1j.d: Likewise. + * testsuite/ld-x86-64/pr20253-1k.d: Likewise. + * testsuite/ld-x86-64/pr20253-1l.d: Likewise. + * testsuite/ld-x86-64/pr20253-2a.c: Likewise. + * testsuite/ld-x86-64/pr20253-2b.S: Likewise. + * testsuite/ld-x86-64/pr20253-2c.S: Likewise. + * testsuite/ld-x86-64/pr20253-2d.S: Likewise. + * testsuite/ld-x86-64/pr20253-3.d: Likewise. + * testsuite/ld-x86-64/pr20253-3.s: Likewise. + * testsuite/ld-x86-64/pr20253-4.s: Likewise. + * testsuite/ld-x86-64/pr20253-4a.d: Likewise. + * testsuite/ld-x86-64/pr20253-4b.d: Likewise. + * testsuite/ld-x86-64/pr20253-4c.d: Likewise. + * testsuite/ld-x86-64/pr20253-4d.d: Likewise. + * testsuite/ld-x86-64/pr20253-4e.d: Likewise. + * testsuite/ld-x86-64/pr20253-4f.d: Likewise. + * testsuite/ld-x86-64/pr20253-5.s: Likewise. + * testsuite/ld-x86-64/pr20253-5a.d: Likewise. + * testsuite/ld-x86-64/pr20253-5b.d: Likewise. + * testsuite/ld-ifunc/ifunc-18a-i386.d: Remove extra IRELATIVE + relocation. + * testsuite/ld-ifunc/ifunc-18a-x86-64.d: Likewise. + * testsuite/ld-ifunc/ifunc-18b-i386.d: Likewise. + * testsuite/ld-ifunc/ifunc-18b-x86-64.d: Likewise. + * testsuite/ld-ifunc/ifunc-18a.s: Fix a typo. + * testsuite/ld-x86-64/x86-64.exp: Run pr20253-1 tests. + 2016-06-17 Thomas Preud'homme <thomas.preudhomme@arm.com> Tony Wang <tony.wang@arm.com> diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 98f0b1c..9efe406 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -408,6 +408,11 @@ run_dump_test "pr20244-2a" run_dump_test "pr20244-2b" run_dump_test "pr20244-2c" run_dump_test "pr20244-2d" +run_dump_test "pr20253-3" +run_dump_test "pr20253-4a" +run_dump_test "pr20253-4b" +run_dump_test "pr20253-4c" +run_dump_test "pr20253-5" if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/no-plt.exp b/ld/testsuite/ld-i386/no-plt.exp index c4af0a9..377253c 100644 --- a/ld/testsuite/ld-i386/no-plt.exp +++ b/ld/testsuite/ld-i386/no-plt.exp @@ -265,6 +265,27 @@ if { [check_ifunc_available] } { "-fPIC -O2 -g" \ { pr20244-3a.c pr20244-3b.S pr20244-3c.S pr20244-3d.S } \ ] \ + [list \ + "Build pr20253-1a.o pr20253-1b.o pr20253-1c.o pr20253-1d.o" \ + "" \ + "-fPIE -O2 -g" \ + { pr20253-1a.c pr20253-1b.S pr20253-1c.S pr20253-1d.S } \ + ] \ + [list \ + "Build libpr20253-1a.so" \ + "-shared tmpdir/pr20253-1b.o \ + tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \ + "" \ + { dummy.s } \ + {} \ + "libpr20253-1a.so" \ + ] \ + [list \ + "Build pr20253-2a.o pr20253-2b.o pr20253-2c.o pr20253-2d.o" \ + "" \ + "-fPIE -O2 -g" \ + { pr20253-2a.c pr20253-2b.S pr20253-2c.S pr20253-2d.S } \ + ] \ ] run_ld_link_exec_tests [] [list \ @@ -286,5 +307,102 @@ if { [check_ifunc_available] } { "pr20244-3b" \ "pass.out" \ ] \ + [list \ + "Run pr20253-1a" \ + "tmpdir/pr20253-1a.o tmpdir/pr20253-1b.o \ + tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \ + "" \ + { dummy.s } \ + "pr20253-1a" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-1b" \ + "--static tmpdir/pr20253-1a.o tmpdir/pr20253-1b.o \ + tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \ + "" \ + { dummy.s } \ + "pr20253-1b" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-1c" \ + "-pie tmpdir/pr20253-1a.o tmpdir/pr20253-1b.o \ + tmpdir/pr20253-1c.o tmpdir/pr20253-1d.o" \ + "" \ + { dummy.s } \ + "pr20253-1c" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-1d" \ + "tmpdir/pr20253-1a.o tmpdir/libpr20253-1a.so" \ + "" \ + { dummy.s } \ + "pr20253-1d" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-1e" \ + "-pie tmpdir/pr20253-1a.o tmpdir/libpr20253-1a.so" \ + "" \ + { dummy.s } \ + "pr20253-1e" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-1f" \ + "tmpdir/pr20253-1a.o" \ + "" \ + { pr20253-1b.S pr20253-1c.S pr20253-1d.S } \ + "pr20253-1f" \ + "pass.out" \ + "-DCHECK_PLT" \ + ] \ + [list \ + "Run pr20253-1g" \ + "--static tmpdir/pr20253-1a.o" \ + "" \ + { pr20253-1b.S pr20253-1c.S pr20253-1d.S } \ + "pr20253-1g" \ + "pass.out" \ + "-DCHECK_PLT" \ + ] \ + [list \ + "Run pr20253-2a" \ + "tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \ + tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \ + "" \ + { dummy.s } \ + "pr20253-2a" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-2b" \ + "--static tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \ + tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \ + "" \ + { dummy.s } \ + "pr20253-2b" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-2c" \ + "tmpdir/pr20253-2a.o" \ + "" \ + { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \ + "pr20253-2c" \ + "pass.out" \ + "-DCHECK_PLT" \ + ] \ + [list \ + "Run pr20253-2d" \ + "--static tmpdir/pr20253-2a.o" \ + "" \ + { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \ + "pr20253-2d" \ + "pass.out" \ + "-DCHECK_PLT" \ + ] \ ] } diff --git a/ld/testsuite/ld-i386/pr13302.d b/ld/testsuite/ld-i386/pr13302.d index 35c09ae..9ab4fa5 100644 --- a/ld/testsuite/ld-i386/pr13302.d +++ b/ld/testsuite/ld-i386/pr13302.d @@ -6,7 +6,3 @@ Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 1 entries: Offset Info Type Sym. Value Symbol's Name [0-9a-f]+ +[0-9a-f]+ +R_386_IRELATIVE + - -Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries: - Offset Info Type Sym. Value Symbol's Name -[0-9a-f]+ +[0-9a-f]+ +R_386_IRELATIVE + diff --git a/ld/testsuite/ld-i386/pr20244-2a.d b/ld/testsuite/ld-i386/pr20244-2a.d index a04902f..ec3948e 100644 --- a/ld/testsuite/ld-i386/pr20244-2a.d +++ b/ld/testsuite/ld-i386/pr20244-2a.d @@ -8,36 +8,25 @@ SYMBOL TABLE: #... -0+80480b1 l i .text 00000000 bar +0+8048085 l i .text 00000000 bar #... -0+80480b2 g F .text 00000000 _start +0+8048086 g F .text 00000000 _start #... -0+80480b0 g i .text 00000000 foo +0+8048084 g i .text 00000000 foo #... - -Disassembly of section .plt: - -0+8048090 <.plt>: - +[a-f0-9]+: ff 25 e0 90 04 08 jmp \*0x80490e0 - +[a-f0-9]+: 68 00 00 00 00 push \$0x0 - +[a-f0-9]+: e9 00 00 00 00 jmp 80480a0 <foo-0x10> - +[a-f0-9]+: ff 25 e4 90 04 08 jmp \*0x80490e4 - +[a-f0-9]+: 68 00 00 00 00 push \$0x0 - +[a-f0-9]+: e9 00 00 00 00 jmp 80480b0 <foo> - Disassembly of section .text: -0+80480b0 <foo>: +0+8048084 <foo>: +[a-f0-9]+: c3 ret -0+80480b1 <bar>: +0+8048085 <bar>: +[a-f0-9]+: c3 ret -0+80480b2 <_start>: - +[a-f0-9]+: ff 15 e0 90 04 08 call \*0x80490e0 - +[a-f0-9]+: ff 25 e4 90 04 08 jmp \*0x80490e4 - +[a-f0-9]+: c7 05 e4 90 04 08 00 00 00 00 movl \$0x0,0x80490e4 - +[a-f0-9]+: 83 3d e0 90 04 08 00 cmpl \$0x0,0x80490e0 - +[a-f0-9]+: b9 10 00 00 00 mov \$0x10,%ecx +0+8048086 <_start>: + +[a-f0-9]+: ff 15 a8 90 04 08 call \*0x80490a8 + +[a-f0-9]+: ff 25 ac 90 04 08 jmp \*0x80490ac + +[a-f0-9]+: c7 05 ac 90 04 08 00 00 00 00 movl \$0x0,0x80490ac + +[a-f0-9]+: 83 3d a8 90 04 08 00 cmpl \$0x0,0x80490a8 + +[a-f0-9]+: b9 fc ff ff ff mov \$0xfffffffc,%ecx #pass diff --git a/ld/testsuite/ld-i386/pr20244-2b.d b/ld/testsuite/ld-i386/pr20244-2b.d index fc0fa17..f23a406 100644 --- a/ld/testsuite/ld-i386/pr20244-2b.d +++ b/ld/testsuite/ld-i386/pr20244-2b.d @@ -7,5 +7,4 @@ .*: +file format .* Contents of section .got.plt: - 80490d4 00000000 00000000 00000000 b0800408 ................ - 80490e4 b1800408 .... + 80490b0 00000000 00000000 00000000 ............ diff --git a/ld/testsuite/ld-i386/pr20244-2c.d b/ld/testsuite/ld-i386/pr20244-2c.d index 54eee9f..acca560 100644 --- a/ld/testsuite/ld-i386/pr20244-2c.d +++ b/ld/testsuite/ld-i386/pr20244-2c.d @@ -6,5 +6,5 @@ Relocation section '.rel.plt' at offset 0x74 contains 2 entries: Offset Info Type Sym. Value Symbol's Name -0+80490e4 0000002a R_386_IRELATIVE -0+80490e0 0000002a R_386_IRELATIVE +0+80490ac 0000002a R_386_IRELATIVE +0+80490a8 0000002a R_386_IRELATIVE diff --git a/ld/testsuite/ld-i386/pr20253-1a.c b/ld/testsuite/ld-i386/pr20253-1a.c new file mode 100644 index 0000000..370275a --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-1a.c @@ -0,0 +1,8 @@ +extern void check (void); + +int +main () +{ + check (); + return 0; +} diff --git a/ld/testsuite/ld-i386/pr20253-1b.S b/ld/testsuite/ld-i386/pr20253-1b.S new file mode 100644 index 0000000..93c6d26 --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-1b.S @@ -0,0 +1,52 @@ + .section .rodata.str1.1,"aMS",@progbits,1 +.LC0: + .string "PASS" + .text + .globl check + .type check, @function +check: + pushl %ebx + call __x86.get_pc_thunk.bx + addl $_GLOBAL_OFFSET_TABLE_, %ebx + subl $8, %esp + call *get_func1@GOT(%ebx) +#ifdef CHECK_PLT + cmpl $func1, %eax +#else + cmpl func1@GOT(%ebx), %eax +#endif + jne .L3 + movl func1_p@GOT(%ebx), %edx + cmpl %eax, (%edx) + jne .L3 + call *func1@GOT(%ebx) + cmpl $1, %eax + jne .L3 + call *call_func1@GOT(%ebx) + cmpl $1, %eax + jne .L3 + call *get_func2@GOT(%ebx) + movl func2_p@GOT(%ebx), %edx + cmpl %eax, (%edx) + jne .L3 + call *call_func2@GOT(%ebx) + cmpl $2, %eax + jne .L3 + leal .LC0@GOTOFF(%ebx), %eax + subl $12, %esp + pushl %eax + call *puts@GOT(%ebx) + addl $24, %esp + popl %ebx + ret +.L3: + call *abort@GOT(%ebx) + .size check, .-check + .section .text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat + .globl __x86.get_pc_thunk.bx + .hidden __x86.get_pc_thunk.bx + .type __x86.get_pc_thunk.bx, @function +__x86.get_pc_thunk.bx: + movl (%esp), %ebx + ret + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-i386/pr20253-1c.S b/ld/testsuite/ld-i386/pr20253-1c.S new file mode 100644 index 0000000..8a17e7c --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-1c.S @@ -0,0 +1,35 @@ + .text + .globl get_func1 + .type get_func1, @function +get_func1: + call __x86.get_pc_thunk.ax + addl $_GLOBAL_OFFSET_TABLE_, %eax + movl func1@GOT(%eax), %eax + ret + .size get_func1, .-get_func1 + .globl call_func1 + .type call_func1, @function +call_func1: + call __x86.get_pc_thunk.ax + addl $_GLOBAL_OFFSET_TABLE_, %eax + jmp *func1@GOT(%eax) + .size call_func1, .-call_func1 + .globl func1_p +#ifdef CHECK_PLT + .section .rodata,"a",@progbits +#else + .section .data.rel,"aw",@progbits +#endif + .align 4 + .type func1_p, @object + .size func1_p, 4 +func1_p: + .long func1 + .section .text.__x86.get_pc_thunk.ax,"axG",@progbits,__x86.get_pc_thunk.ax,comdat + .globl __x86.get_pc_thunk.ax + .hidden __x86.get_pc_thunk.ax + .type __x86.get_pc_thunk.ax, @function +__x86.get_pc_thunk.ax: + movl (%esp), %eax + ret + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-i386/pr20253-1d.S b/ld/testsuite/ld-i386/pr20253-1d.S new file mode 100644 index 0000000..2d6a1de --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-1d.S @@ -0,0 +1,81 @@ + .text + .type implementation1, @function +implementation1: + movl $1, %eax + ret + .size implementation1, .-implementation1 + .type implementation2, @function +implementation2: + movl $2, %eax + ret + .size implementation2, .-implementation2 + .type resolver2, @function +resolver2: + call __x86.get_pc_thunk.ax + addl $_GLOBAL_OFFSET_TABLE_, %eax + leal implementation2@GOTOFF(%eax), %eax + ret + .size resolver2, .-resolver2 + .type func2, @gnu_indirect_function + .set func2,resolver2 + .type resolver1, @function +resolver1: + call __x86.get_pc_thunk.ax + addl $_GLOBAL_OFFSET_TABLE_, %eax + leal implementation1@GOTOFF(%eax), %eax + ret + .size resolver1, .-resolver1 + .globl func1 + .type func1, @gnu_indirect_function + .set func1,resolver1 + .globl get_func2 + .type get_func2, @function +get_func2: + call __x86.get_pc_thunk.ax + addl $_GLOBAL_OFFSET_TABLE_, %eax + movl func2@GOT(%eax), %eax + ret + .size get_func2, .-get_func2 + .globl call_func2 + .type call_func2, @function +call_func2: + pushl %ebx + call __x86.get_pc_thunk.bx + addl $_GLOBAL_OFFSET_TABLE_, %ebx + subl $8, %esp + call *get_func2@GOT(%ebx) + cmpl func2@GOT(%ebx), %eax + jne .L10 + addl $8, %esp + movl %ebx, %eax + popl %ebx + jmp *func2@GOT(%eax) +.L10: + call *abort@GOT(%ebx) + .size call_func2, .-call_func2 + .globl func2_p +#ifdef CHECK_PLT + .section .rodata,"a",@progbits +#else + .section .data.rel,"aw",@progbits +#endif + .align 4 + .type func2_p, @object + .size func2_p, 4 +func2_p: + .long func2 + .section .text.__x86.get_pc_thunk.ax,"axG",@progbits,__x86.get_pc_thunk.ax,comdat + .globl __x86.get_pc_thunk.ax + .hidden __x86.get_pc_thunk.ax + .type __x86.get_pc_thunk.ax, @function +__x86.get_pc_thunk.ax: + movl (%esp), %eax + ret + .section .text.__x86.get_pc_thunk.bx,"axG",@progbits,__x86.get_pc_thunk.bx,comdat + .globl __x86.get_pc_thunk.bx + .hidden __x86.get_pc_thunk.bx + .type __x86.get_pc_thunk.bx, @function +__x86.get_pc_thunk.bx: + movl (%esp), %ebx + ret + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-i386/pr20253-2a.c b/ld/testsuite/ld-i386/pr20253-2a.c new file mode 100644 index 0000000..370275a --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-2a.c @@ -0,0 +1,8 @@ +extern void check (void); + +int +main () +{ + check (); + return 0; +} diff --git a/ld/testsuite/ld-i386/pr20253-2b.S b/ld/testsuite/ld-i386/pr20253-2b.S new file mode 100644 index 0000000..46ab4f4 --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-2b.S @@ -0,0 +1,39 @@ + .section .rodata.str1.1,"aMS",@progbits,1 +.LC0: + .string "PASS" + .text + .globl check + .type check, @function +check: + subl $12, %esp + call *get_func1@GOT +#ifdef CHECK_PLT + movl $func1, %edx +#else + movl func1@GOT, %edx +#endif + cmpl %edx, %eax + jne .L3 + cmpl %edx, func1_p + jne .L3 + call *func1@GOT + cmpl $1, %eax + jne .L3 + call *call_func1@GOT + cmpl $1, %eax + jne .L3 + call *get_func2@GOT + cmpl %eax, func2_p + jne .L3 + call *call_func2@GOT + cmpl $2, %eax + jne .L3 + subl $12, %esp + pushl $.LC0 + call *puts@GOT + addl $28, %esp + ret +.L3: + call *abort@GOT + .size check, .-check + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-i386/pr20253-2c.S b/ld/testsuite/ld-i386/pr20253-2c.S new file mode 100644 index 0000000..7e724b4 --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-2c.S @@ -0,0 +1,24 @@ + .text + .globl get_func1 + .type get_func1, @function +get_func1: + movl func1@GOT, %eax + ret + .size get_func1, .-get_func1 + .globl call_func1 + .type call_func1, @function +call_func1: + jmp *func1@GOT + .size call_func1, .-call_func1 + .globl func1_p +#ifdef CHECK_PLT + .section .rodata,"a",@progbits +#else + .section .data.rel,"aw",@progbits +#endif + .align 4 + .type func1_p, @object + .size func1_p, 4 +func1_p: + .long func1 + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-i386/pr20253-2d.S b/ld/testsuite/ld-i386/pr20253-2d.S new file mode 100644 index 0000000..5c1f9ae --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-2d.S @@ -0,0 +1,49 @@ + .text + .type implementation1, @function +implementation1: + movl $1, %eax + ret + .size implementation1, .-implementation1 + .type implementation2, @function +implementation2: + movl $2, %eax + ret + .size implementation2, .-implementation2 + .type resolver2, @function +resolver2: + movl $implementation2, %eax + ret + .size resolver2, .-resolver2 + .type func2, @gnu_indirect_function + .set func2,resolver2 + .type resolver1, @function +resolver1: + movl $implementation1, %eax + ret + .size resolver1, .-resolver1 + .globl func1 + .type func1, @gnu_indirect_function + .set func1,resolver1 + .globl get_func2 + .type get_func2, @function +get_func2: + movl func2@GOT, %eax + ret + .size get_func2, .-get_func2 + .globl call_func2 + .type call_func2, @function +call_func2: + jmp *func2@GOT + .size call_func2, .-call_func2 + .globl func2_p +#ifdef CHECK_PLT + .section .rodata,"a",@progbits +#else + .section .data.rel,"aw",@progbits +#endif + .align 4 + .type func2_p, @object + .size func2_p, 4 +func2_p: + .long func2 + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-i386/pr20253-3.d b/ld/testsuite/ld-i386/pr20253-3.d new file mode 100644 index 0000000..7ce0b58 --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-3.d @@ -0,0 +1,3 @@ +#as: --32 +#ld: -melf_i386 +#error: relocation R_386_PC32 against STT_GNU_IFUNC symbol `foo' isn't supported diff --git a/ld/testsuite/ld-i386/pr20253-3.s b/ld/testsuite/ld-i386/pr20253-3.s new file mode 100644 index 0000000..8cd25fb --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-3.s @@ -0,0 +1,11 @@ + .text + .type foo,%gnu_indirect_function +foo: + ret + .globl _start +_start: + ret + .globl __start +__start: + .data + .long foo - . diff --git a/ld/testsuite/ld-i386/pr20253-4.s b/ld/testsuite/ld-i386/pr20253-4.s new file mode 100644 index 0000000..88f0f1b --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-4.s @@ -0,0 +1,11 @@ + .text + .type foo,%gnu_indirect_function +foo: + ret + .globl _start +_start: + movl __start@GOT(%eax), %eax + .globl __start +__start: + .data + .dc.a foo diff --git a/ld/testsuite/ld-i386/pr20253-4a.d b/ld/testsuite/ld-i386/pr20253-4a.d new file mode 100644 index 0000000..cd10080 --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-4a.d @@ -0,0 +1,8 @@ +#source: pr20253-4.s +#as: --32 -mrelax-relocations=yes +#ld: -melf_i386 +#readelf: -r --wide + +Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name +[0-9a-f]+ +[0-9a-f]+ +R_386_IRELATIVE + diff --git a/ld/testsuite/ld-i386/pr20253-4b.d b/ld/testsuite/ld-i386/pr20253-4b.d new file mode 100644 index 0000000..3b45f8f --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-4b.d @@ -0,0 +1,8 @@ +#source: pr20253-4.s +#as: --32 -mrelax-relocations=yes +#ld: -pie -melf_i386 +#readelf: -r --wide + +Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name +[0-9a-f]+ +[0-9a-f]+ +R_386_IRELATIVE + diff --git a/ld/testsuite/ld-i386/pr20253-4c.d b/ld/testsuite/ld-i386/pr20253-4c.d new file mode 100644 index 0000000..6fa68aa --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-4c.d @@ -0,0 +1,9 @@ +#source: pr20253-4.s +#as: --32 -mrelax-relocations=yes +#ld: -shared -melf_i386 +#readelf: -r --wide + +Relocation section '.rel.dyn' at offset 0x[0-9a-f]+ contains 2 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name +[0-9a-f]+ +[0-9a-f]+ +R_386_GLOB_DAT +[0-9a-f]+ +__start +[0-9a-f]+ +[0-9a-f]+ +R_386_IRELATIVE + diff --git a/ld/testsuite/ld-i386/pr20253-5.d b/ld/testsuite/ld-i386/pr20253-5.d new file mode 100644 index 0000000..0936d98 --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-5.d @@ -0,0 +1,7 @@ +#as: --32 +#ld: -melf_i386 +#readelf: -r --wide + +Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name +[0-9a-f]+ +[0-9a-f]+ +R_386_IRELATIVE + diff --git a/ld/testsuite/ld-i386/pr20253-5.s b/ld/testsuite/ld-i386/pr20253-5.s new file mode 100644 index 0000000..0cc1803 --- /dev/null +++ b/ld/testsuite/ld-i386/pr20253-5.s @@ -0,0 +1,10 @@ + .text + .globl _start + .type _start, @function +_start: + call *func1@GOT(%eax) + cmp $func1,%eax + .globl func1 + .type func1, @gnu_indirect_function +func1: + ret diff --git a/ld/testsuite/ld-ifunc/ifunc-13-i386.d b/ld/testsuite/ld-ifunc/ifunc-13-i386.d index 677fa92..8dd3fed 100644 --- a/ld/testsuite/ld-ifunc/ifunc-13-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-13-i386.d @@ -8,7 +8,3 @@ Relocation section '.rel.ifunc' at offset 0x[0-9a-f]+ contains 1 entries: [ ]+Offset[ ]+Info[ ]+Type[ ]+.* [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_32[ ]+ifunc\(\)[ ]+ifunc - -Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries: -[ ]+Offset[ ]+Info[ ]+Type[ ]+.* -[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_JUMP_SLOT[ ]+ifunc\(\)[ ]+ifunc diff --git a/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d index b01c735..1a1d061 100644 --- a/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-13-x86-64.d @@ -8,7 +8,3 @@ Relocation section '.rela.ifunc' at offset 0x[0-9a-f]+ contains 1 entries: [ ]+Offset[ ]+Info[ ]+Type[ ]+.* [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_64[ ]+ifunc\(\)[ ]+ifunc \+ 0 - -Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: -[ ]+Offset[ ]+Info[ ]+Type[ ]+.* -[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_JUMP_SLOT[ ]+ifunc\(\)[ ]+ifunc \+ 0 diff --git a/ld/testsuite/ld-ifunc/ifunc-15-i386.d b/ld/testsuite/ld-ifunc/ifunc-15-i386.d index c37dd51..0d44ba1 100644 --- a/ld/testsuite/ld-ifunc/ifunc-15-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-15-i386.d @@ -7,7 +7,3 @@ Relocation section '.rel.got' at offset 0x[0-9a-f]+ contains 1 entries: [ ]+Offset[ ]+Info[ ]+Type[ ]+.* [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_GLOB_DAT[ ]+ifunc\(\)[ ]+ifunc - -Relocation section '.rel.plt' at offset 0x[0-9a-f]+ contains 1 entries: -[ ]+Offset[ ]+Info[ ]+Type[ ]+.* -[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_JUMP_SLOT[ ]+ifunc\(\)[ ]+ifunc diff --git a/ld/testsuite/ld-ifunc/ifunc-15-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-15-x86-64.d index a4a5cb1..8a28ec9 100644 --- a/ld/testsuite/ld-ifunc/ifunc-15-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-15-x86-64.d @@ -7,7 +7,3 @@ Relocation section '.rela.got' at offset 0x[0-9a-f]+ contains 1 entries: [ ]+Offset[ ]+Info[ ]+Type[ ]+.* [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_GLOB_DAT[ ]+ifunc\(\)[ ]+ifunc \+ 0 - -Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: -[ ]+Offset[ ]+Info[ ]+Type[ ]+.* -[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_JUMP_SLOT[ ]+ifunc\(\)[ ]+ifunc \+ 0 diff --git a/ld/testsuite/ld-ifunc/ifunc-18a-i386.d b/ld/testsuite/ld-ifunc/ifunc-18a-i386.d index 10490b1..7c392fb 100644 --- a/ld/testsuite/ld-ifunc/ifunc-18a-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-18a-i386.d @@ -12,4 +12,3 @@ Relocation section '.rel.ifunc' at .* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_IRELATIVE[ ]* -[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_IRELATIVE[ ]* diff --git a/ld/testsuite/ld-ifunc/ifunc-18a-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-18a-x86-64.d index 0d600eb..e9d6031 100644 --- a/ld/testsuite/ld-ifunc/ifunc-18a-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-18a-x86-64.d @@ -12,4 +12,3 @@ Relocation section '.rela.ifunc' at .* Relocation section '.rela.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_IRELATIVE[ ]+[0-9a-f]* -[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_IRELATIVE[ ]+[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-18a.s b/ld/testsuite/ld-ifunc/ifunc-18a.s index c29c121..f68c151 100644 --- a/ld/testsuite/ld-ifunc/ifunc-18a.s +++ b/ld/testsuite/ld-ifunc/ifunc-18a.s @@ -1,5 +1,5 @@ .section .data.rel,"aw",@progbits - .globl foo_ptrt + .globl foo_ptr .type foo_ptr, @object foo_ptr: .dc.a foo diff --git a/ld/testsuite/ld-ifunc/ifunc-18b-i386.d b/ld/testsuite/ld-ifunc/ifunc-18b-i386.d index a5eda94..4b63c57 100644 --- a/ld/testsuite/ld-ifunc/ifunc-18b-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-18b-i386.d @@ -12,4 +12,3 @@ Relocation section '.rel.ifunc' at .* Relocation section '.rel.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_IRELATIVE[ ]* -[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_386_IRELATIVE[ ]* diff --git a/ld/testsuite/ld-ifunc/ifunc-18b-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-18b-x86-64.d index 8dfebfb..b4ff6c3 100644 --- a/ld/testsuite/ld-ifunc/ifunc-18b-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-18b-x86-64.d @@ -12,4 +12,3 @@ Relocation section '.rela.ifunc' at .* Relocation section '.rela.plt' at .* [ ]+Offset[ ]+Info[ ]+Type[ ]+.* [0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_IRELATIVE[ ]+[0-9a-f]* -[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_X86_64_IRELATIVE[ ]+[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-21-i386.d b/ld/testsuite/ld-ifunc/ifunc-21-i386.d index e609dbe..d61ccd0 100644 --- a/ld/testsuite/ld-ifunc/ifunc-21-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-21-i386.d @@ -5,18 +5,20 @@ .*: +file format .* -#... -0+8048090 <__start>: -[ ]*[a-f0-9]+: ff 93 0c 00 00 00 call \*0xc\(%ebx\) -[ ]*[a-f0-9]+: ff a3 0c 00 00 00 jmp \*0xc\(%ebx\) -[ ]*[a-f0-9]+: 03 83 0c 00 00 00 add 0xc\(%ebx\),%eax -[ ]*[a-f0-9]+: 8b 83 0c 00 00 00 mov 0xc\(%ebx\),%eax -[ ]*[a-f0-9]+: 85 83 0c 00 00 00 test %eax,0xc\(%ebx\) -[ ]*[a-f0-9]+: c7 c0 b5 80 04 08 mov \$0x80480b5,%eax -0+80480b4 <foo>: -[ ]*[a-f0-9]+: c3 ret +Disassembly of section .text: -0+80480b5 <bar>: -[ ]*[a-f0-9]+: c3 ret +0+804807c <__start>: + +[a-f0-9]+: ff 93 fc ff ff ff call \*-0x4\(%ebx\) + +[a-f0-9]+: ff a3 fc ff ff ff jmp \*-0x4\(%ebx\) + +[a-f0-9]+: 03 83 fc ff ff ff add -0x4\(%ebx\),%eax + +[a-f0-9]+: 8b 83 fc ff ff ff mov -0x4\(%ebx\),%eax + +[a-f0-9]+: 85 83 fc ff ff ff test %eax,-0x4\(%ebx\) + +[a-f0-9]+: c7 c0 a1 80 04 08 mov \$0x80480a1,%eax + +0+80480a0 <foo>: + +[a-f0-9]+: c3 ret + +0+80480a1 <bar>: + +[a-f0-9]+: c3 ret #pass diff --git a/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d index e28734e..4e3582d 100644 --- a/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-21-x86-64.d @@ -5,18 +5,20 @@ .*: +file format .* -#... -0+4000e0 <__start>: -[ ]*[a-f0-9]+: ff 15 42 00 20 00 callq \*0x200042\(%rip\) # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: ff 25 3c 00 20 00 jmpq \*0x20003c\(%rip\) # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: 48 03 05 35 00 20 00 add 0x200035\(%rip\),%rax # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: 48 8b 05 2e 00 20 00 mov 0x20002e\(%rip\),%rax # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: 48 85 05 27 00 20 00 test %rax,0x200027\(%rip\) # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: 48 c7 c0 09 01 40 00 mov \$0x400109,%rax -0+400108 <foo>: -[ ]*[a-f0-9]+: c3 retq +Disassembly of section .text: -0+400109 <bar>: -[ ]*[a-f0-9]+: c3 retq +0+4000c8 <__start>: + +[a-f0-9]+: ff 15 2a 00 20 00 callq \*0x20002a\(%rip\) # 6000f8 <bar\+0x200007> + +[a-f0-9]+: ff 25 24 00 20 00 jmpq \*0x200024\(%rip\) # 6000f8 <bar\+0x200007> + +[a-f0-9]+: 48 03 05 1d 00 20 00 add 0x20001d\(%rip\),%rax # 6000f8 <bar\+0x200007> + +[a-f0-9]+: 48 8b 05 16 00 20 00 mov 0x200016\(%rip\),%rax # 6000f8 <bar\+0x200007> + +[a-f0-9]+: 48 85 05 0f 00 20 00 test %rax,0x20000f\(%rip\) # 6000f8 <bar\+0x200007> + +[a-f0-9]+: 48 c7 c0 f1 00 40 00 mov \$0x4000f1,%rax + +0+4000f0 <foo>: + +[a-f0-9]+: c3 retq + +0+4000f1 <bar>: + +[a-f0-9]+: c3 retq #pass diff --git a/ld/testsuite/ld-ifunc/ifunc-22-i386.d b/ld/testsuite/ld-ifunc/ifunc-22-i386.d index e609dbe..d61ccd0 100644 --- a/ld/testsuite/ld-ifunc/ifunc-22-i386.d +++ b/ld/testsuite/ld-ifunc/ifunc-22-i386.d @@ -5,18 +5,20 @@ .*: +file format .* -#... -0+8048090 <__start>: -[ ]*[a-f0-9]+: ff 93 0c 00 00 00 call \*0xc\(%ebx\) -[ ]*[a-f0-9]+: ff a3 0c 00 00 00 jmp \*0xc\(%ebx\) -[ ]*[a-f0-9]+: 03 83 0c 00 00 00 add 0xc\(%ebx\),%eax -[ ]*[a-f0-9]+: 8b 83 0c 00 00 00 mov 0xc\(%ebx\),%eax -[ ]*[a-f0-9]+: 85 83 0c 00 00 00 test %eax,0xc\(%ebx\) -[ ]*[a-f0-9]+: c7 c0 b5 80 04 08 mov \$0x80480b5,%eax -0+80480b4 <foo>: -[ ]*[a-f0-9]+: c3 ret +Disassembly of section .text: -0+80480b5 <bar>: -[ ]*[a-f0-9]+: c3 ret +0+804807c <__start>: + +[a-f0-9]+: ff 93 fc ff ff ff call \*-0x4\(%ebx\) + +[a-f0-9]+: ff a3 fc ff ff ff jmp \*-0x4\(%ebx\) + +[a-f0-9]+: 03 83 fc ff ff ff add -0x4\(%ebx\),%eax + +[a-f0-9]+: 8b 83 fc ff ff ff mov -0x4\(%ebx\),%eax + +[a-f0-9]+: 85 83 fc ff ff ff test %eax,-0x4\(%ebx\) + +[a-f0-9]+: c7 c0 a1 80 04 08 mov \$0x80480a1,%eax + +0+80480a0 <foo>: + +[a-f0-9]+: c3 ret + +0+80480a1 <bar>: + +[a-f0-9]+: c3 ret #pass diff --git a/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d index e28734e..4e3582d 100644 --- a/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d +++ b/ld/testsuite/ld-ifunc/ifunc-22-x86-64.d @@ -5,18 +5,20 @@ .*: +file format .* -#... -0+4000e0 <__start>: -[ ]*[a-f0-9]+: ff 15 42 00 20 00 callq \*0x200042\(%rip\) # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: ff 25 3c 00 20 00 jmpq \*0x20003c\(%rip\) # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: 48 03 05 35 00 20 00 add 0x200035\(%rip\),%rax # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: 48 8b 05 2e 00 20 00 mov 0x20002e\(%rip\),%rax # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: 48 85 05 27 00 20 00 test %rax,0x200027\(%rip\) # 600128 <_GLOBAL_OFFSET_TABLE_\+0x18> -[ ]*[a-f0-9]+: 48 c7 c0 09 01 40 00 mov \$0x400109,%rax -0+400108 <foo>: -[ ]*[a-f0-9]+: c3 retq +Disassembly of section .text: -0+400109 <bar>: -[ ]*[a-f0-9]+: c3 retq +0+4000c8 <__start>: + +[a-f0-9]+: ff 15 2a 00 20 00 callq \*0x20002a\(%rip\) # 6000f8 <bar\+0x200007> + +[a-f0-9]+: ff 25 24 00 20 00 jmpq \*0x200024\(%rip\) # 6000f8 <bar\+0x200007> + +[a-f0-9]+: 48 03 05 1d 00 20 00 add 0x20001d\(%rip\),%rax # 6000f8 <bar\+0x200007> + +[a-f0-9]+: 48 8b 05 16 00 20 00 mov 0x200016\(%rip\),%rax # 6000f8 <bar\+0x200007> + +[a-f0-9]+: 48 85 05 0f 00 20 00 test %rax,0x20000f\(%rip\) # 6000f8 <bar\+0x200007> + +[a-f0-9]+: 48 c7 c0 f1 00 40 00 mov \$0x4000f1,%rax + +0+4000f0 <foo>: + +[a-f0-9]+: c3 retq + +0+4000f1 <bar>: + +[a-f0-9]+: c3 retq #pass diff --git a/ld/testsuite/ld-ifunc/ifunc-23-x86.s b/ld/testsuite/ld-ifunc/ifunc-23-x86.s new file mode 100644 index 0000000..69c2279 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-23-x86.s @@ -0,0 +1,10 @@ + .type foo,%gnu_indirect_function +foo: + ret + .globl _start +_start: + ret + .globl __start +__start: + .data + .dc.a foo diff --git a/ld/testsuite/ld-ifunc/ifunc-23a-x86.d b/ld/testsuite/ld-ifunc/ifunc-23a-x86.d new file mode 100644 index 0000000..47ec5d1 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-23a-x86.d @@ -0,0 +1,8 @@ +#source: ifunc-23-x86.s +#ld: +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-23b-x86.d b/ld/testsuite/ld-ifunc/ifunc-23b-x86.d new file mode 100644 index 0000000..dbe2ec1 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-23b-x86.d @@ -0,0 +1,8 @@ +#source: ifunc-23-x86.s +#ld: -pie +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +Relocation section '.rel(a|).dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-23c-x86.d b/ld/testsuite/ld-ifunc/ifunc-23c-x86.d new file mode 100644 index 0000000..dc7e5c1 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-23c-x86.d @@ -0,0 +1,8 @@ +#source: ifunc-23-x86.s +#ld: -shared +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +Relocation section '.rel(a|).dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-24-x86.s b/ld/testsuite/ld-ifunc/ifunc-24-x86.s new file mode 100644 index 0000000..967cdf6 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-24-x86.s @@ -0,0 +1,11 @@ + .text + .type foo,%gnu_indirect_function +foo: + ret + .globl _start +_start: + call foo@PLT + .globl __start +__start: + .data + .dc.a foo diff --git a/ld/testsuite/ld-ifunc/ifunc-24a-x86.d b/ld/testsuite/ld-ifunc/ifunc-24a-x86.d new file mode 100644 index 0000000..78bd4e2 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-24a-x86.d @@ -0,0 +1,8 @@ +#source: ifunc-24-x86.s +#ld: +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-24b-x86.d b/ld/testsuite/ld-ifunc/ifunc-24b-x86.d new file mode 100644 index 0000000..c73b019 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-24b-x86.d @@ -0,0 +1,12 @@ +#source: ifunc-24-x86.s +#ld: -pie +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +Relocation section '.rel(a|).dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* + +Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-24c-x86.d b/ld/testsuite/ld-ifunc/ifunc-24c-x86.d new file mode 100644 index 0000000..db16754 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-24c-x86.d @@ -0,0 +1,12 @@ +#source: ifunc-24-x86.s +#ld: -shared +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +Relocation section '.rel(a|).dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* + +Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-25-x86.s b/ld/testsuite/ld-ifunc/ifunc-25-x86.s new file mode 100644 index 0000000..0549cbf --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-25-x86.s @@ -0,0 +1,12 @@ + .text + .globl foo + .type foo,%gnu_indirect_function +foo: + ret + .globl _start +_start: + call foo@PLT + .globl __start +__start: + .data + .dc.a foo diff --git a/ld/testsuite/ld-ifunc/ifunc-25a-x86.d b/ld/testsuite/ld-ifunc/ifunc-25a-x86.d new file mode 100644 index 0000000..0f37f52 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-25a-x86.d @@ -0,0 +1,8 @@ +#source: ifunc-25-x86.s +#ld: +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-25b-x86.d b/ld/testsuite/ld-ifunc/ifunc-25b-x86.d new file mode 100644 index 0000000..96b0ed5 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-25b-x86.d @@ -0,0 +1,12 @@ +#source: ifunc-25-x86.s +#ld: -pie +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +Relocation section '.rel(a|).dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* + +Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)+_IRELATIVE[ ]*[0-9a-f]* diff --git a/ld/testsuite/ld-ifunc/ifunc-25c-x86.d b/ld/testsuite/ld-ifunc/ifunc-25c-x86.d new file mode 100644 index 0000000..f9c08dc --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-25c-x86.d @@ -0,0 +1,12 @@ +#source: ifunc-25-x86.s +#ld: -shared +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +Relocation section '.rel(a|).dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)_(32|64) +foo\(\) +foo( \+ 0|) + +Relocation section '.rel(a|).plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name.* +[0-9a-f]+[ ]+[0-9a-f]+[ ]+R_(386|X86_64)_JUMP_SLOT +foo\(\) +foo( \+ 0|) diff --git a/ld/testsuite/ld-x86-64/no-plt.exp b/ld/testsuite/ld-x86-64/no-plt.exp index d57ccb5..bdf1843 100644 --- a/ld/testsuite/ld-x86-64/no-plt.exp +++ b/ld/testsuite/ld-x86-64/no-plt.exp @@ -199,3 +199,88 @@ run_ld_link_exec_tests [] [list \ "pass.out" \ ] \ ] + +# Run-time tests which require working IFUNC support. +if { [check_ifunc_available] } { + run_cc_link_tests [list \ + [list \ + "Build pr20253-2a.o pr20253-2b.o pr20253-2c.o pr20253-2d.o" \ + "" \ + "-fPIE -O2 -g" \ + { pr20253-2a.c pr20253-2b.S pr20253-2c.S pr20253-2d.S } \ + ] \ + [list \ + "Build libpr20253-2a.so" \ + "-shared tmpdir/pr20253-2b.o \ + tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \ + "" \ + { dummy.s } \ + {} \ + "libpr20253-2a.so" \ + ] \ + ] + + run_ld_link_exec_tests [] [list \ + [list \ + "Run pr20253-2a" \ + "tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \ + tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \ + "" \ + { dummy.s } \ + "pr20253-2a" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-2b" \ + "--static tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \ + tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \ + "" \ + { dummy.s } \ + "pr20253-2b" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-2c" \ + "-pie tmpdir/pr20253-2a.o tmpdir/pr20253-2b.o \ + tmpdir/pr20253-2c.o tmpdir/pr20253-2d.o" \ + "" \ + { dummy.s } \ + "pr20253-2c" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-2d" \ + "tmpdir/pr20253-2a.o tmpdir/libpr20253-2a.so" \ + "" \ + { dummy.s } \ + "pr20253-2d" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-2e" \ + "-pie tmpdir/pr20253-2a.o tmpdir/libpr20253-2a.so" \ + "" \ + { dummy.s } \ + "pr20253-2e" \ + "pass.out" \ + ] \ + [list \ + "Run pr20253-2f" \ + "tmpdir/pr20253-2a.o" \ + "" \ + { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \ + "pr20253-2f" \ + "pass.out" \ + "-DCHECK_PLT" \ + ] \ + [list \ + "Run pr20253-2g" \ + "--static tmpdir/pr20253-2a.o" \ + "" \ + { pr20253-2b.S pr20253-2c.S pr20253-2d.S } \ + "pr20253-2g" \ + "pass.out" \ + "-DCHECK_PLT" \ + ] \ + ] +} diff --git a/ld/testsuite/ld-x86-64/pr13082-5a.d b/ld/testsuite/ld-x86-64/pr13082-5a.d index 191c29e..d1b100d 100644 --- a/ld/testsuite/ld-x86-64/pr13082-5a.d +++ b/ld/testsuite/ld-x86-64/pr13082-5a.d @@ -7,7 +7,3 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: Offset Info Type Sym. Value Symbol's Name \+ Addend [0-9a-f]+ +[0-9a-f]+ +R_X86_64_32 +ifunc\(\)+ +ifunc \+ 0 - -Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: - Offset Info Type Sym. Value Symbol's Name \+ Addend -[0-9a-f]+ +[0-9a-f]+ +R_X86_64_JUMP_SLOT +ifunc\(\)+ +ifunc \+ 0 diff --git a/ld/testsuite/ld-x86-64/pr13082-5b.d b/ld/testsuite/ld-x86-64/pr13082-5b.d index 1c5a5e7..01e403b 100644 --- a/ld/testsuite/ld-x86-64/pr13082-5b.d +++ b/ld/testsuite/ld-x86-64/pr13082-5b.d @@ -7,7 +7,3 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: Offset Info Type Sym. Value Symbol's Name \+ Addend [0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ - -Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: - Offset Info Type Sym. Value Symbol's Name \+ Addend -[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr13082-6a.d b/ld/testsuite/ld-x86-64/pr13082-6a.d index 9a1a655..5914f3d 100644 --- a/ld/testsuite/ld-x86-64/pr13082-6a.d +++ b/ld/testsuite/ld-x86-64/pr13082-6a.d @@ -7,7 +7,3 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: Offset Info Type Sym. Value Symbol's Name \+ Addend [0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ - -Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: - Offset Info Type Sym. Value Symbol's Name \+ Addend -[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr13082-6b.d b/ld/testsuite/ld-x86-64/pr13082-6b.d index 792c348..6ff23ff 100644 --- a/ld/testsuite/ld-x86-64/pr13082-6b.d +++ b/ld/testsuite/ld-x86-64/pr13082-6b.d @@ -7,7 +7,3 @@ Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: Offset Info Type Sym. Value Symbol's Name \+ Addend [0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ - -Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: - Offset Info Type Sym. Value Symbol's Name \+ Addend -[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-1.s b/ld/testsuite/ld-x86-64/pr20253-1.s new file mode 100644 index 0000000..4b9b7a4 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1.s @@ -0,0 +1,18 @@ + .text + .globl foo + .type foo, @gnu_indirect_function +foo: + ret + .text + .type bar, @gnu_indirect_function +bar: + ret + .globl _start + .type _start, @function +_start: + call *foo@GOTPCREL(%rip) + jmp *bar@GOTPCREL(%rip) + movq $0, bar@GOTPCREL(%rip) + cmpq $0, foo@GOTPCREL(%rip) + cmpq foo@GOTPCREL(%rip), %rcx + cmpq bar@GOTPCREL(%rip), %rcx diff --git a/ld/testsuite/ld-x86-64/pr20253-1a.d b/ld/testsuite/ld-x86-64/pr20253-1a.d new file mode 100644 index 0000000..94c7c1d --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1a.d @@ -0,0 +1,9 @@ +#source: pr20253-1.s +#as: --64 +#ld: -melf_x86_64 +#readelf: -r --wide + +Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 2 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-1b.d b/ld/testsuite/ld-x86-64/pr20253-1b.d new file mode 100644 index 0000000..247e042 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1b.d @@ -0,0 +1,25 @@ +#source: pr20253-1.s +#as: --64 +#ld: -melf_x86_64 +#objdump: -dw +#notarget: x86_64-*-nacl* + +.*: +file format .* + + +Disassembly of section .text: + +0+4000e0 <foo>: + +[a-f0-9]+: c3 retq + +0+4000e1 <bar>: + +[a-f0-9]+: c3 retq + +0+4000e2 <_start>: + +[a-f0-9]+: ff 15 28 00 20 00 callq \*0x200028\(%rip\) # 600110 <_start\+0x20002e> + +[a-f0-9]+: ff 25 2a 00 20 00 jmpq \*0x20002a\(%rip\) # 600118 <_start\+0x200036> + +[a-f0-9]+: 48 c7 05 1f 00 20 00 00 00 00 00 movq \$0x0,0x20001f\(%rip\) # 600118 <_start\+0x200036> + +[a-f0-9]+: 48 83 3d 0f 00 20 00 00 cmpq \$0x0,0x20000f\(%rip\) # 600110 <_start\+0x20002e> + +[a-f0-9]+: 48 3b 0d 08 00 20 00 cmp 0x200008\(%rip\),%rcx # 600110 <_start\+0x20002e> + +[a-f0-9]+: 48 3b 0d 09 00 20 00 cmp 0x200009\(%rip\),%rcx # 600118 <_start\+0x200036> +#pass diff --git a/ld/testsuite/ld-x86-64/pr20253-1c.d b/ld/testsuite/ld-x86-64/pr20253-1c.d new file mode 100644 index 0000000..02c4542 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1c.d @@ -0,0 +1,9 @@ +#source: pr20253-1.s +#as: --64 +#ld: -pie -melf_x86_64 +#readelf: -r --wide + +Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-1d.d b/ld/testsuite/ld-x86-64/pr20253-1d.d new file mode 100644 index 0000000..35c04f8 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1d.d @@ -0,0 +1,25 @@ +#source: pr20253-1.s +#as: --64 +#ld: -pie -melf_x86_64 +#objdump: -dw +#notarget: x86_64-*-nacl* + +.*: +file format .* + + +Disassembly of section .text: + +0+1c8 <foo>: + +[a-f0-9]+: c3 retq + +0+1c9 <bar>: + +[a-f0-9]+: c3 retq + +0+1ca <_start>: + +[a-f0-9]+: ff 15 28 01 20 00 callq \*0x200128\(%rip\) # 2002f8 <_DYNAMIC\+0x100> + +[a-f0-9]+: ff 25 2a 01 20 00 jmpq \*0x20012a\(%rip\) # 200300 <_DYNAMIC\+0x108> + +[a-f0-9]+: 48 c7 05 1f 01 20 00 00 00 00 00 movq \$0x0,0x20011f\(%rip\) # 200300 <_DYNAMIC\+0x108> + +[a-f0-9]+: 48 83 3d 0f 01 20 00 00 cmpq \$0x0,0x20010f\(%rip\) # 2002f8 <_DYNAMIC\+0x100> + +[a-f0-9]+: 48 3b 0d 08 01 20 00 cmp 0x200108\(%rip\),%rcx # 2002f8 <_DYNAMIC\+0x100> + +[a-f0-9]+: 48 3b 0d 09 01 20 00 cmp 0x200109\(%rip\),%rcx # 200300 <_DYNAMIC\+0x108> +#pass diff --git a/ld/testsuite/ld-x86-64/pr20253-1e.d b/ld/testsuite/ld-x86-64/pr20253-1e.d new file mode 100644 index 0000000..722fdf7 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1e.d @@ -0,0 +1,9 @@ +#source: pr20253-1.s +#as: --64 +#ld: -shared -melf_x86_64 +#readelf: -r --wide + +Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_GLOB_DAT +foo\(\)+ +foo \+ 0 +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-1f.d b/ld/testsuite/ld-x86-64/pr20253-1f.d new file mode 100644 index 0000000..d84b60e --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1f.d @@ -0,0 +1,25 @@ +#source: pr20253-1.s +#as: --64 +#ld: -shared -melf_x86_64 +#objdump: -dw +#notarget: x86_64-*-nacl* + +.*: +file format .* + + +Disassembly of section .text: + +0+1f8 <foo>: + +[a-f0-9]+: c3 retq + +0+1f9 <bar>: + +[a-f0-9]+: c3 retq + +0+1fa <_start>: + +[a-f0-9]+: ff 15 08 01 20 00 callq \*0x200108\(%rip\) # 200308 <_DYNAMIC\+0xe0> + +[a-f0-9]+: ff 25 0a 01 20 00 jmpq \*0x20010a\(%rip\) # 200310 <_DYNAMIC\+0xe8> + +[a-f0-9]+: 48 c7 05 ff 00 20 00 00 00 00 00 movq \$0x0,0x2000ff\(%rip\) # 200310 <_DYNAMIC\+0xe8> + +[a-f0-9]+: 48 83 3d ef 00 20 00 00 cmpq \$0x0,0x2000ef\(%rip\) # 200308 <_DYNAMIC\+0xe0> + +[a-f0-9]+: 48 3b 0d e8 00 20 00 cmp 0x2000e8\(%rip\),%rcx # 200308 <_DYNAMIC\+0xe0> + +[a-f0-9]+: 48 3b 0d e9 00 20 00 cmp 0x2000e9\(%rip\),%rcx # 200310 <_DYNAMIC\+0xe8> +#pass diff --git a/ld/testsuite/ld-x86-64/pr20253-1g.d b/ld/testsuite/ld-x86-64/pr20253-1g.d new file mode 100644 index 0000000..671a980 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1g.d @@ -0,0 +1,9 @@ +#source: pr20253-1.s +#as: --x32 +#ld: -melf32_x86_64 +#readelf: -r --wide + +Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 2 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-1h.d b/ld/testsuite/ld-x86-64/pr20253-1h.d new file mode 100644 index 0000000..77ff100 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1h.d @@ -0,0 +1,25 @@ +#source: pr20253-1.s +#as: --x32 +#ld: -melf32_x86_64 +#objdump: -dw +#notarget: x86_64-*-nacl* + +.*: +file format .* + + +Disassembly of section .text: + +0+40008c <foo>: + +[a-f0-9]+: c3 retq + +0+40008d <bar>: + +[a-f0-9]+: c3 retq + +0+40008e <_start>: + +[a-f0-9]+: ff 15 28 00 20 00 callq \*0x200028\(%rip\) # 6000bc <_start\+0x20002e> + +[a-f0-9]+: ff 25 2a 00 20 00 jmpq \*0x20002a\(%rip\) # 6000c4 <_start\+0x200036> + +[a-f0-9]+: 48 c7 05 1f 00 20 00 00 00 00 00 movq \$0x0,0x20001f\(%rip\) # 6000c4 <_start\+0x200036> + +[a-f0-9]+: 48 83 3d 0f 00 20 00 00 cmpq \$0x0,0x20000f\(%rip\) # 6000bc <_start\+0x20002e> + +[a-f0-9]+: 48 3b 0d 08 00 20 00 cmp 0x200008\(%rip\),%rcx # 6000bc <_start\+0x20002e> + +[a-f0-9]+: 48 3b 0d 09 00 20 00 cmp 0x200009\(%rip\),%rcx # 6000c4 <_start\+0x200036> +#pass diff --git a/ld/testsuite/ld-x86-64/pr20253-1i.d b/ld/testsuite/ld-x86-64/pr20253-1i.d new file mode 100644 index 0000000..bf42ed1 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1i.d @@ -0,0 +1,9 @@ +#source: pr20253-1.s +#as: --x32 +#ld: -pie -melf32_x86_64 +#readelf: -r --wide + +Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-1j.d b/ld/testsuite/ld-x86-64/pr20253-1j.d new file mode 100644 index 0000000..6f5d666 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1j.d @@ -0,0 +1,25 @@ +#source: pr20253-1.s +#as: --x32 +#ld: -pie -melf32_x86_64 +#objdump: -dw +#notarget: x86_64-*-nacl* + +.*: +file format .* + + +Disassembly of section .text: + +0+120 <foo>: + +[a-f0-9]+: c3 retq + +0+121 <bar>: + +[a-f0-9]+: c3 retq + +0+122 <_start>: + +[a-f0-9]+: ff 15 a8 00 20 00 callq \*0x2000a8\(%rip\) # 2001d0 <_DYNAMIC\+0x80> + +[a-f0-9]+: ff 25 aa 00 20 00 jmpq \*0x2000aa\(%rip\) # 2001d8 <_DYNAMIC\+0x88> + +[a-f0-9]+: 48 c7 05 9f 00 20 00 00 00 00 00 movq \$0x0,0x20009f\(%rip\) # 2001d8 <_DYNAMIC\+0x88> + +[a-f0-9]+: 48 83 3d 8f 00 20 00 00 cmpq \$0x0,0x20008f\(%rip\) # 2001d0 <_DYNAMIC\+0x80> + +[a-f0-9]+: 48 3b 0d 88 00 20 00 cmp 0x200088\(%rip\),%rcx # 2001d0 <_DYNAMIC\+0x80> + +[a-f0-9]+: 48 3b 0d 89 00 20 00 cmp 0x200089\(%rip\),%rcx # 2001d8 <_DYNAMIC\+0x88> +#pass diff --git a/ld/testsuite/ld-x86-64/pr20253-1k.d b/ld/testsuite/ld-x86-64/pr20253-1k.d new file mode 100644 index 0000000..1d55770 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1k.d @@ -0,0 +1,9 @@ +#source: pr20253-1.s +#as: --x32 +#ld: -shared -melf32_x86_64 +#readelf: -r --wide + +Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_GLOB_DAT +foo\(\)+ +foo \+ 0 +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-1l.d b/ld/testsuite/ld-x86-64/pr20253-1l.d new file mode 100644 index 0000000..0276558 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-1l.d @@ -0,0 +1,25 @@ +#source: pr20253-1.s +#as: --x32 +#ld: -shared -melf32_x86_64 +#objdump: -dw +#notarget: x86_64-*-nacl* + +.*: +file format .* + + +Disassembly of section .text: + +0+158 <foo>: + +[a-f0-9]+: c3 retq + +0+159 <bar>: + +[a-f0-9]+: c3 retq + +0+15a <_start>: + +[a-f0-9]+: ff 15 98 00 20 00 callq \*0x200098\(%rip\) # 2001f8 <_DYNAMIC\+0x70> + +[a-f0-9]+: ff 25 9a 00 20 00 jmpq \*0x20009a\(%rip\) # 200200 <_DYNAMIC\+0x78> + +[a-f0-9]+: 48 c7 05 8f 00 20 00 00 00 00 00 movq \$0x0,0x20008f\(%rip\) # 200200 <_DYNAMIC\+0x78> + +[a-f0-9]+: 48 83 3d 7f 00 20 00 00 cmpq \$0x0,0x20007f\(%rip\) # 2001f8 <_DYNAMIC\+0x70> + +[a-f0-9]+: 48 3b 0d 78 00 20 00 cmp 0x200078\(%rip\),%rcx # 2001f8 <_DYNAMIC\+0x70> + +[a-f0-9]+: 48 3b 0d 79 00 20 00 cmp 0x200079\(%rip\),%rcx # 200200 <_DYNAMIC\+0x78> +#pass diff --git a/ld/testsuite/ld-x86-64/pr20253-2a.c b/ld/testsuite/ld-x86-64/pr20253-2a.c new file mode 100644 index 0000000..370275a --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-2a.c @@ -0,0 +1,8 @@ +extern void check (void); + +int +main () +{ + check (); + return 0; +} diff --git a/ld/testsuite/ld-x86-64/pr20253-2b.S b/ld/testsuite/ld-x86-64/pr20253-2b.S new file mode 100644 index 0000000..9bfab0c --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-2b.S @@ -0,0 +1,46 @@ + .section .rodata.str1.1,"aMS",@progbits,1 +.LC0: + .string "PASS" + .text + .globl check + .type check, @function +check: + subq $8, %rsp + call *get_func1@GOTPCREL(%rip) +#ifdef CHECK_PLT + cmpl $func1, %eax +#else + cmpq func1@GOTPCREL(%rip), %rax +#endif + jne .L3 + movq func1_p@GOTPCREL(%rip), %rdx +#ifdef __LP64__ + cmpq %rax, (%rdx) +#else + cmpl %eax, (%rdx) +#endif + jne .L3 + call *func1@GOTPCREL(%rip) + cmpl $1, %eax + jne .L3 + call *call_func1@GOTPCREL(%rip) + cmpl $1, %eax + jne .L3 + call *get_func2@GOTPCREL(%rip) + movq func2_p@GOTPCREL(%rip), %rdx +#ifdef __LP64__ + cmpq %rax, (%rdx) +#else + cmpl %eax, (%rdx) +#endif + jne .L3 + call *call_func2@GOTPCREL(%rip) + cmpl $2, %eax + jne .L3 + leaq .LC0(%rip), %rdi + addq $8, %rsp + jmp *puts@GOTPCREL(%rip) +.L3: + call *abort@GOTPCREL(%rip) + .size check, .-check + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-x86-64/pr20253-2c.S b/ld/testsuite/ld-x86-64/pr20253-2c.S new file mode 100644 index 0000000..5ec7e76 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-2c.S @@ -0,0 +1,29 @@ + .text + .globl get_func1 + .type get_func1, @function +get_func1: + movq func1@GOTPCREL(%rip), %rax + ret + .size get_func1, .-get_func1 + .globl call_func1 + .type call_func1, @function +call_func1: + jmp *func1@GOTPCREL(%rip) + .size call_func1, .-call_func1 + .globl func1_p +#ifdef CHECK_PLT + .section .rodata,"a",@progbits +#else + .section .data.rel,"aw",@progbits +#endif +#ifdef __LP64__ + .align 8 + .size func1_p, 8 +#else + .align 4 + .size func1_p, 4 +#endif + .type func1_p, @object +func1_p: + .dc.a func1 + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-x86-64/pr20253-2d.S b/ld/testsuite/ld-x86-64/pr20253-2d.S new file mode 100644 index 0000000..bc4c32e --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-2d.S @@ -0,0 +1,61 @@ + .text + .type implementation1, @function +implementation1: + movl $1, %eax + ret + .size implementation1, .-implementation1 + .type implementation2, @function +implementation2: + movl $2, %eax + ret + .size implementation2, .-implementation2 + .type resolver2, @function +resolver2: + leaq implementation2(%rip), %rax + ret + .size resolver2, .-resolver2 + .type func2, @gnu_indirect_function + .set func2,resolver2 + .type resolver1, @function +resolver1: + leaq implementation1(%rip), %rax + ret + .size resolver1, .-resolver1 + .globl func1 + .type func1, @gnu_indirect_function + .set func1,resolver1 + .globl get_func2 + .type get_func2, @function +get_func2: + movq func2@GOTPCREL(%rip), %rax + ret + .size get_func2, .-get_func2 + .globl call_func2 + .type call_func2, @function +call_func2: + subq $8, %rsp + call *get_func2@GOTPCREL(%rip) + cmpq func2@GOTPCREL(%rip), %rax + jne .L10 + addq $8, %rsp + jmp *func2@GOTPCREL(%rip) +.L10: + call *abort@GOTPCREL(%rip) + .size call_func2, .-call_func2 + .globl func2_p +#ifdef CHECK_PLT + .section .rodata,"a",@progbits +#else + .section .data.rel,"aw",@progbits +#endif +#ifdef __LP64__ + .align 8 + .size func2_p, 8 +#else + .align 4 + .size func2_p, 4 +#endif + .type func2_p, @object +func2_p: + .dc.a func2 + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-x86-64/pr20253-3.d b/ld/testsuite/ld-x86-64/pr20253-3.d new file mode 100644 index 0000000..30db29c --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-3.d @@ -0,0 +1,3 @@ +#as: --64 +#ld: -melf_x86_64 +#error: relocation R_X86_64_PC32 against STT_GNU_IFUNC symbol `foo' isn't supported diff --git a/ld/testsuite/ld-x86-64/pr20253-3.s b/ld/testsuite/ld-x86-64/pr20253-3.s new file mode 100644 index 0000000..8cd25fb --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-3.s @@ -0,0 +1,11 @@ + .text + .type foo,%gnu_indirect_function +foo: + ret + .globl _start +_start: + ret + .globl __start +__start: + .data + .long foo - . diff --git a/ld/testsuite/ld-x86-64/pr20253-4.s b/ld/testsuite/ld-x86-64/pr20253-4.s new file mode 100644 index 0000000..7dc9aa3 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-4.s @@ -0,0 +1,11 @@ + .text + .type foo,%gnu_indirect_function +foo: + ret + .globl _start +_start: + movq __start@GOTPCREL(%rip), %rax + .globl __start +__start: + .data + .dc.a foo diff --git a/ld/testsuite/ld-x86-64/pr20253-4a.d b/ld/testsuite/ld-x86-64/pr20253-4a.d new file mode 100644 index 0000000..041c164 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-4a.d @@ -0,0 +1,8 @@ +#source: pr20253-4.s +#as: --64 +#ld: -melf_x86_64 +#readelf: -r --wide + +Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-4b.d b/ld/testsuite/ld-x86-64/pr20253-4b.d new file mode 100644 index 0000000..6dc95b5 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-4b.d @@ -0,0 +1,8 @@ +#source: pr20253-4.s +#as: --64 +#ld: -pie -melf_x86_64 +#readelf: -r --wide + +Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-4c.d b/ld/testsuite/ld-x86-64/pr20253-4c.d new file mode 100644 index 0000000..26fa0df --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-4c.d @@ -0,0 +1,9 @@ +#source: pr20253-4.s +#as: --64 +#ld: -shared -melf_x86_64 +#readelf: -r --wide + +Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_GLOB_DAT +[0-9a-f]+ +__start \+ 0 +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-4d.d b/ld/testsuite/ld-x86-64/pr20253-4d.d new file mode 100644 index 0000000..52dd877 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-4d.d @@ -0,0 +1,8 @@ +#source: pr20253-4.s +#as: --x32 +#ld: -melf32_x86_64 +#readelf: -r --wide + +Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-4e.d b/ld/testsuite/ld-x86-64/pr20253-4e.d new file mode 100644 index 0000000..d9f2fa4 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-4e.d @@ -0,0 +1,8 @@ +#source: pr20253-4.s +#as: --x32 +#ld: -pie -melf32_x86_64 +#readelf: -r --wide + +Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-4f.d b/ld/testsuite/ld-x86-64/pr20253-4f.d new file mode 100644 index 0000000..fb3d6f8 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-4f.d @@ -0,0 +1,9 @@ +#source: pr20253-4.s +#as: --x32 +#ld: -shared -melf32_x86_64 +#readelf: -r --wide + +Relocation section '.rela.dyn' at offset 0x[0-9a-f]+ contains 2 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_GLOB_DAT +[0-9a-f]+ +__start \+ 0 +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-5.s b/ld/testsuite/ld-x86-64/pr20253-5.s new file mode 100644 index 0000000..ade0e8b --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-5.s @@ -0,0 +1,10 @@ + .text + .globl _start + .type _start, @function +_start: + call *func1@GOTPCREL(%rip) + cmp $func1,%eax + .globl func1 + .type func1, @gnu_indirect_function +func1: + ret diff --git a/ld/testsuite/ld-x86-64/pr20253-5a.d b/ld/testsuite/ld-x86-64/pr20253-5a.d new file mode 100644 index 0000000..1eceda4 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-5a.d @@ -0,0 +1,8 @@ +#source: pr20253-5.s +#as: --64 +#ld: -melf_x86_64 +#readelf: -r --wide + +Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/pr20253-5b.d b/ld/testsuite/ld-x86-64/pr20253-5b.d new file mode 100644 index 0000000..c1cb335 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr20253-5b.d @@ -0,0 +1,8 @@ +#source: pr20253-5.s +#as: --x32 +#ld: -melf32_x86_64 +#readelf: -r --wide + +Relocation section '.rela.plt' at offset 0x[0-9a-f]+ contains 1 entries: + +Offset +Info +Type +Sym.* Value +Symbol's Name \+ Addend +[0-9a-f]+ +[0-9a-f]+ +R_X86_64_IRELATIVE +[0-9a-f]+ diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 7fd953b..f6f89e2 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -503,6 +503,27 @@ run_dump_test "pr19609-7d" run_dump_test "pr19939a" run_dump_test "pr19939b" run_dump_test "pr19719" +run_dump_test "pr20253-1a" +run_dump_test "pr20253-1b" +run_dump_test "pr20253-1c" +run_dump_test "pr20253-1d" +run_dump_test "pr20253-1e" +run_dump_test "pr20253-1f" +run_dump_test "pr20253-1g" +run_dump_test "pr20253-1h" +run_dump_test "pr20253-1i" +run_dump_test "pr20253-1j" +run_dump_test "pr20253-1k" +run_dump_test "pr20253-1l" +run_dump_test "pr20253-3" +run_dump_test "pr20253-4a" +run_dump_test "pr20253-4b" +run_dump_test "pr20253-4c" +run_dump_test "pr20253-4d" +run_dump_test "pr20253-4e" +run_dump_test "pr20253-4f" +run_dump_test "pr20253-5a" +run_dump_test "pr20253-5b" proc undefined_weak {cflags ldflags} { set testname "Undefined weak symbol" |