diff options
| -rw-r--r-- | bfd/elfxx-x86.c | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/i386.exp | 1 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/pr30787.d | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/pr30787.s | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-i386/pr30787.t | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr30787.d | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr30787.s | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/pr30787.t | 4 | ||||
| -rw-r--r-- | ld/testsuite/ld-x86-64/x86-64.exp | 1 |
9 files changed, 39 insertions, 2 deletions
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index f224e8f..103559d 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -2771,11 +2771,12 @@ _bfd_x86_elf_finish_dynamic_sections (bfd *output_bfd, break; case DT_JMPREL: - dyn.d_un.d_ptr = htab->elf.srelplt->output_section->vma; + s = htab->elf.srelplt; + dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; break; case DT_PLTRELSZ: - s = htab->elf.srelplt->output_section; + s = htab->elf.srelplt; dyn.d_un.d_val = s->size; break; diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp index 5f53bcf..e8ad973 100644 --- a/ld/testsuite/ld-i386/i386.exp +++ b/ld/testsuite/ld-i386/i386.exp @@ -511,6 +511,7 @@ run_dump_test "dt-relr-1a" run_dump_test "dt-relr-1b" run_dump_test "pr28870" run_dump_test "pr28894" +run_dump_test "pr30787" if { !([istarget "i?86-*-linux*"] || [istarget "i?86-*-gnu*"] diff --git a/ld/testsuite/ld-i386/pr30787.d b/ld/testsuite/ld-i386/pr30787.d new file mode 100644 index 0000000..f82411d --- /dev/null +++ b/ld/testsuite/ld-i386/pr30787.d @@ -0,0 +1,7 @@ +#as: --32 +#ld: -melf_i386 -shared --no-warn-rwx-segments -T pr30787.t +#readelf: -d --wide + +#... + 0x0+2 \(PLTRELSZ\) +8 \(bytes\) +#pass diff --git a/ld/testsuite/ld-i386/pr30787.s b/ld/testsuite/ld-i386/pr30787.s new file mode 100644 index 0000000..71594d2 --- /dev/null +++ b/ld/testsuite/ld-i386/pr30787.s @@ -0,0 +1,6 @@ + .text + .globl foo +foo: + jmp bar@PLT + leal func@GOT(%ebx), %eax + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-i386/pr30787.t b/ld/testsuite/ld-i386/pr30787.t new file mode 100644 index 0000000..8c47620 --- /dev/null +++ b/ld/testsuite/ld-i386/pr30787.t @@ -0,0 +1,4 @@ +SECTIONS +{ + .rel.dyn : { *(.rel.*) } +} diff --git a/ld/testsuite/ld-x86-64/pr30787.d b/ld/testsuite/ld-x86-64/pr30787.d new file mode 100644 index 0000000..29102d4 --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr30787.d @@ -0,0 +1,7 @@ +#as: --64 +#ld: -melf_x86_64 -shared --no-warn-rwx-segments -T pr30787.t +#readelf: -d --wide + +#... + 0x0+2 \(PLTRELSZ\) +24 \(bytes\) +#pass diff --git a/ld/testsuite/ld-x86-64/pr30787.s b/ld/testsuite/ld-x86-64/pr30787.s new file mode 100644 index 0000000..8bc774f --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr30787.s @@ -0,0 +1,6 @@ + .text + .globl foo +foo: + jmp bar@PLT + movq func@GOTPCREL(%rip), %rax + .section .note.GNU-stack,"",@progbits diff --git a/ld/testsuite/ld-x86-64/pr30787.t b/ld/testsuite/ld-x86-64/pr30787.t new file mode 100644 index 0000000..66759cb --- /dev/null +++ b/ld/testsuite/ld-x86-64/pr30787.t @@ -0,0 +1,4 @@ +SECTIONS +{ + .rela.dyn : { *(.rela.*) } +} diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp index 1a10c39..f94284b 100644 --- a/ld/testsuite/ld-x86-64/x86-64.exp +++ b/ld/testsuite/ld-x86-64/x86-64.exp @@ -505,6 +505,7 @@ run_dump_test "dt-relr-1a" run_dump_test "dt-relr-1a-x32" run_dump_test "dt-relr-1b" run_dump_test "dt-relr-1b-x32" +run_dump_test "pr30787" if { ![skip_sframe_tests] } { run_dump_test "sframe-simple-1" |