diff options
| author | Alyssa Milburn <amilburn@zall.org> | 2016-12-04 22:59:18 -0800 |
|---|---|---|
| committer | Jose E. Marchesi <jose.marchesi@oracle.com> | 2016-12-04 22:59:18 -0800 |
| commit | 597e138ca0cf96889a1965d06d28552c1d1174d2 (patch) | |
| tree | 7260625ac8e8cc05479232f4b7cd08e54374a4c9 | |
| parent | a55c9876bb111fd301b4762cf501de0040b8f9db (diff) | |
| download | gdb-597e138ca0cf96889a1965d06d28552c1d1174d2.zip gdb-597e138ca0cf96889a1965d06d28552c1d1174d2.tar.gz gdb-597e138ca0cf96889a1965d06d28552c1d1174d2.tar.bz2 | |
bfd,ld: Continue after partially-successful relaxed call relocations in sparc.
bfd/ChangeLog:
2016-12-05 Alyssa Milburn <amilburn@zall.org>
* elfxx-sparc.c: Do not stop processing relocations after
partially relaxing a call with WDISP30.
ld/ChangeLog:
2016-12-05 Alyssa Milburn <amilburn@zall.org>
* testsuite/ld-sparc/wdispcall.s: New file.
* testsuite/ld-sparc/wdispcall.dd: Likewise.
* testsuite/ld-sparc/sparc.exp: Run new test.
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfxx-sparc.c | 4 | ||||
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/testsuite/ld-sparc/sparc.exp | 3 | ||||
| -rw-r--r-- | ld/testsuite/ld-sparc/wdispcall.dd | 18 | ||||
| -rw-r--r-- | ld/testsuite/ld-sparc/wdispcall.s | 14 |
6 files changed, 48 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b84dfab..9632eac 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2016-12-05 Alyssa Milburn <amilburn@zall.org> + + * elfxx-sparc.c: Do not stop processing relocations after + partially relaxing a call with WDISP30. + 2016-12-05 Nick Clifton <nickc@redhat.com> PR binutils/20922 diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c index 056a4b7..f191d57 100644 --- a/bfd/elfxx-sparc.c +++ b/bfd/elfxx-sparc.c @@ -4122,7 +4122,7 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd, contents + rel->r_offset - 4); if ((z & (0xffffffff ^ RD(~0))) != (INSN_OR | RS1(O7) | RS2(G0))) - break; + continue; /* The sequence was or %o7, %g0, %rN @@ -4135,7 +4135,7 @@ _bfd_sparc_elf_relocate_section (bfd *output_bfd, reg = (y & RS1(~0)) >> 14; if (reg != ((z & RD(~0)) >> 25) || reg == G0 || reg == O7) - break; + continue; bfd_put_32 (input_bfd, (bfd_vma) INSN_NOP, contents + rel->r_offset + 4); diff --git a/ld/ChangeLog b/ld/ChangeLog index 90283e3..3529834 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2016-12-05 Alyssa Milburn <amilburn@zall.org> + + * testsuite/ld-sparc/wdispcall.s: New file. + * testsuite/ld-sparc/wdispcall.dd: Likewise. + * testsuite/ld-sparc/sparc.exp: Run new test. + 2016-12-03 Alan Modra <amodra@gmail.com> * emultempl/ppc64elf.em (gld${EMULATION_NAME}_finish): Don't call diff --git a/ld/testsuite/ld-sparc/sparc.exp b/ld/testsuite/ld-sparc/sparc.exp index e58a21f..ec92d12 100644 --- a/ld/testsuite/ld-sparc/sparc.exp +++ b/ld/testsuite/ld-sparc/sparc.exp @@ -94,6 +94,9 @@ set sparctests { {{readelf -WSsrl gotop32.rd} {objdump -drj.text gotop32.dd} {objdump -sj.got gotop32.sd} {objdump -sj.data gotop32.td}} "libgotop32.so"} + {"relaxed call WDISP30 relocation" "-static -melf32_sparc -relax" "" + "--32" {wdispcall.s} + {{objdump -dj.wdispcall wdispcall.dd}} "wdispcall"} } set sparc64tests { {"64-bit: TLS -fpic -shared transitions" "-shared -melf64_sparc" "" diff --git a/ld/testsuite/ld-sparc/wdispcall.dd b/ld/testsuite/ld-sparc/wdispcall.dd new file mode 100644 index 0000000..ab06a56 --- /dev/null +++ b/ld/testsuite/ld-sparc/wdispcall.dd @@ -0,0 +1,18 @@ +#source: wdispcall.s +#as: --32 +#ld: -static -melf32_sparc -relax +#objdump: -dj.wdispcall +#target: sparc*-*-* + +.*: +file format elf32-sparc + +Disassembly of section .wdispcall: + +00000000 <foo>: + +0: 01 00 00 00 nop * + +4: 10 80 40 ff b 10400 <bar> + +8: 9e 10 40 00 mov %g1, %o7 + +c: 01 00 00 00 nop * + +10: 40 00 40 fc call 10400 <bar> + +14: 01 00 00 00 nop * + diff --git a/ld/testsuite/ld-sparc/wdispcall.s b/ld/testsuite/ld-sparc/wdispcall.s new file mode 100644 index 0000000..0b05cad --- /dev/null +++ b/ld/testsuite/ld-sparc/wdispcall.s @@ -0,0 +1,14 @@ + .text +bar: + retl + nop + + .align 1024 + .section ".wdispcall" +foo: + nop + call bar + or %r1, %g0, %o7 + nop + call bar + nop |