diff options
author | Maciej W. Rozycki <macro@imgtec.com> | 2016-07-12 01:30:01 +0100 |
---|---|---|
committer | Maciej W. Rozycki <macro@imgtec.com> | 2016-07-14 20:06:37 +0100 |
commit | 0c117286270e8166022900f4e5fef89719ccd2dc (patch) | |
tree | 18f975afeb0915c736a174dba92170844a274d65 /ld/testsuite | |
parent | 7f131b39970944cb53b407715880d333c5248cac (diff) | |
download | gdb-0c117286270e8166022900f4e5fef89719ccd2dc.zip gdb-0c117286270e8166022900f4e5fef89719ccd2dc.tar.gz gdb-0c117286270e8166022900f4e5fef89719ccd2dc.tar.bz2 |
BFD: Let targets handle relocations against absolute symbols
Fix a generic BFD issue with relocations against absolute symbols, which
are installed without using any individual relocation handler provided
by the backend. This causes any absolute section's addend to be lost on
REL targets such as o32 MIPS, and also relocation-specific calculation
adjustments are not made.
As an example assembling this program:
$ cat test.s
.text
foo:
b bar
b baz
.set bar, 0x1234
$ as -EB -32 -o test-o32.o test.s
$ as -EB -n32 -o test-n32.o test.s
produces this binary code:
$ objdump -dr test-o32.o test-n32.o
test-o32.o: file format elf32-tradbigmips
Disassembly of section .text:
00000000 <foo>:
0: 10000000 b 4 <foo+0x4>
0: R_MIPS_PC16 *ABS*
4: 00000000 nop
8: 1000ffff b 8 <foo+0x8>
8: R_MIPS_PC16 baz
c: 00000000 nop
test-n32.o: file format elf32-ntradbigmips
Disassembly of section .text:
00000000 <foo>:
0: 10000000 b 4 <foo+0x4>
0: R_MIPS_PC16 *ABS*+0x1230
4: 00000000 nop
8: 10000000 b c <foo+0xc>
8: R_MIPS_PC16 baz-0x4
c: 00000000 nop
$
where it is clearly visible in `test-o32.o', which uses REL relocations,
that the absolute section's addend equivalent to the value of `bar' -- a
reference to which cannot be fully resolved at the assembly time,
because the reference is PC-relative -- has been lost, as has been the
relocation-specific adjustment of -4, required to take into account the
PC+4-relative calculation made by hardware with branches and seen in the
external symbol reference to `baz' as the `ffff' addend encoded in the
instruction word. In `test-n32.o', which uses RELA relocations, the
absolute section's addend has been correctly retained.
Give precedence then in `bfd_perform_relocation' and
`bfd_install_relocation' to any individual relocation handler the
backend selected may have provided, while still resorting to the generic
calculation otherwise. This retains the semantics which we've had since
forever or before the beginning of our repository history, and is at the
very least compatible with `bfd_elf_generic_reloc' being used as the
handler.
Retain the `bfd_is_und_section' check unchanged at the beginning of
`bfd_perform_relocation' since this does not affect the semantics of the
function. The check returns the same `bfd_reloc_undefined' code the
check for a null `howto' does, so swapping the two does not matter.
Also the check is is mutually exclusive with the `bfd_is_abs_section'
check, since a section cannot be absolute and undefined both at once, so
swapping the two does not matter either.
With this change applied the program quoted above now has the in-place
addend correctly calculated and installed in the field being relocated:
$ objdump -dr fixed-o32.o
fixed-o32.o: file format elf32-tradbigmips
Disassembly of section .text:
00000000 <foo>:
0: 1000048c b 1234 <bar>
0: R_MIPS_PC16 *ABS*
4: 00000000 nop
8: 1000ffff b 8 <foo+0x8>
8: R_MIPS_PC16 baz
c: 00000000 nop
$
Add a set of MIPS tests to cover the relevant cases, including absolute
symbols with addends, and verifying that PC-relative relocations against
symbols concerned resolve to the same value in the final link regardless
of whether the REL or the RELA relocation form is used. Exclude linker
tests though which would overflow the in-place addend on REL targets and
use them as dump patterns for RELA targets only.
bfd/
* reloc.c (bfd_perform_relocation): Try the `howto' handler
first with relocations against absolute symbols.
(bfd_install_relocation): Likewise.
gas/
* testsuite/gas/mips/mips16-branch-absolute.d: Update patterns.
* testsuite/gas/mips/branch-absolute.d: New test.
* testsuite/gas/mips/branch-absolute-n32.d: New test.
* testsuite/gas/mips/branch-absolute-n64.d: New test.
* testsuite/gas/mips/branch-absolute-addend-n32.d: New test.
* testsuite/gas/mips/branch-absolute-addend-n64.d: New test.
* testsuite/gas/mips/mips16-branch-absolute-n32.d: New test.
* testsuite/gas/mips/mips16-branch-absolute-n64.d: New test.
* testsuite/gas/mips/mips16-branch-absolute-addend-n32.d: New
test.
* testsuite/gas/mips/mips16-branch-absolute-addend-n64.d: New
test.
* testsuite/gas/mips/micromips-branch-absolute.d: New test.
* testsuite/gas/mips/micromips-branch-absolute-n32.d: New test.
* testsuite/gas/mips/micromips-branch-absolute-n64.d: New test.
* testsuite/gas/mips/micromips-branch-absolute-addend-n32.d: New
test.
* testsuite/gas/mips/micromips-branch-absolute-addend-n64.d: New
test.
* testsuite/gas/mips/branch-absolute.s: New test source.
* testsuite/gas/mips/branch-absolute-addend.s: New test source.
* testsuite/gas/mips/mips16-branch-absolute-addend.s: New test
source.
* testsuite/gas/mips/micromips-branch-absolute.s: New test
source.
* testsuite/gas/mips/micromips-branch-absolute-addend.s: New
test source.
* testsuite/gas/mips/mips.exp: Run the new tests.
ld/
* testsuite/ld-mips-elf/branch-absolute.d: New test.
* testsuite/ld-mips-elf/branch-absolute-n32.d: New test.
* testsuite/ld-mips-elf/branch-absolute-n64.d: New test.
* testsuite/ld-mips-elf/branch-absolute-addend.d: New test.
* testsuite/ld-mips-elf/branch-absolute-addend-n32.d: New test.
* testsuite/ld-mips-elf/branch-absolute-addend-n64.d: New test.
* testsuite/ld-mips-elf/micromips-branch-absolute.d: New test.
* testsuite/ld-mips-elf/micromips-branch-absolute-n32.d: New
test.
* testsuite/ld-mips-elf/micromips-branch-absolute-n64.d: New
test.
* testsuite/ld-mips-elf/micromips-branch-absolute-addend.d: New
test.
* testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d:
New test.
* testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d:
New test.
* testsuite/ld-mips-elf/mips-elf.exp: Run the new tests, except
from `branch-absolute-addend' and
`micromips-branch-absolute-addend', referred indirectly only.
Diffstat (limited to 'ld/testsuite')
13 files changed, 155 insertions, 0 deletions
diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-addend-n32.d b/ld/testsuite/ld-mips-elf/branch-absolute-addend-n32.d new file mode 100644 index 0000000..82fd6c6 --- /dev/null +++ b/ld/testsuite/ld-mips-elf/branch-absolute-addend-n32.d @@ -0,0 +1,6 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS link branch to absolute expression with addend (n32) +#source: ../../../gas/testsuite/gas/mips/branch-absolute-addend.s +#as: -EB -n32 -march=from-abi +#ld: -EB -Ttext 0x12340000 -e foo +#dump: branch-absolute-addend.d diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-addend-n64.d b/ld/testsuite/ld-mips-elf/branch-absolute-addend-n64.d new file mode 100644 index 0000000..9bb7c8f --- /dev/null +++ b/ld/testsuite/ld-mips-elf/branch-absolute-addend-n64.d @@ -0,0 +1,6 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS link branch to absolute expression with addend (n64) +#source: ../../../gas/testsuite/gas/mips/branch-absolute-addend.s +#as: -EB -64 -march=from-abi +#ld: -EB -Ttext 0x12340000 -e foo +#dump: branch-absolute-addend.d diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-addend.d b/ld/testsuite/ld-mips-elf/branch-absolute-addend.d new file mode 100644 index 0000000..063962b --- /dev/null +++ b/ld/testsuite/ld-mips-elf/branch-absolute-addend.d @@ -0,0 +1,21 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS link branch to absolute expression with addend +#source: ../../../gas/testsuite/gas/mips/branch-absolute-addend.s +#as: -EB -32 +#ld: -EB -Ttext 0x12340000 -e foo + +.*: +file format .*mips.* + +Disassembly of section \.text: + \.\.\. +[0-9a-f]+ <[^>]*> 1000162a b 0*123468ac <bar\+0x1234> +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 04111628 bal 0*123468ac <bar\+0x1234> +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 04101626 bltzal zero,0*123468ac <bar\+0x1234> +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 10401624 beqz v0,0*123468ac <bar\+0x1234> +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 14401622 bnez v0,0*123468ac <bar\+0x1234> +[0-9a-f]+ <[^>]*> 00000000 nop + \.\.\. diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-n32.d b/ld/testsuite/ld-mips-elf/branch-absolute-n32.d new file mode 100644 index 0000000..b1ecf64 --- /dev/null +++ b/ld/testsuite/ld-mips-elf/branch-absolute-n32.d @@ -0,0 +1,6 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS link branch to absolute expression (n32) +#source: ../../../gas/testsuite/gas/mips/branch-absolute.s +#as: -EB -n32 -march=from-abi +#ld: -EB -Ttext 0 -e foo +#dump: branch-absolute.d diff --git a/ld/testsuite/ld-mips-elf/branch-absolute-n64.d b/ld/testsuite/ld-mips-elf/branch-absolute-n64.d new file mode 100644 index 0000000..9b8dcff --- /dev/null +++ b/ld/testsuite/ld-mips-elf/branch-absolute-n64.d @@ -0,0 +1,6 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS link branch to absolute expression (n64) +#source: ../../../gas/testsuite/gas/mips/branch-absolute.s +#as: -EB -64 -march=from-abi +#ld: -EB -Ttext 0 -e foo +#dump: branch-absolute.d diff --git a/ld/testsuite/ld-mips-elf/branch-absolute.d b/ld/testsuite/ld-mips-elf/branch-absolute.d new file mode 100644 index 0000000..65e4317 --- /dev/null +++ b/ld/testsuite/ld-mips-elf/branch-absolute.d @@ -0,0 +1,21 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: MIPS link branch to absolute expression +#source: ../../../gas/testsuite/gas/mips/branch-absolute.s +#as: -EB -32 +#ld: -EB -Ttext 0 -e foo + +.*: +file format .*mips.* + +Disassembly of section \.text: + \.\.\. +[0-9a-f]+ <[^>]*> 1000008c b 0+001234 <bar> +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 0411008a bal 0+001234 <bar> +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 04100088 bltzal zero,0+001234 <bar> +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 10400086 beqz v0,0+001234 <bar> +[0-9a-f]+ <[^>]*> 00000000 nop +[0-9a-f]+ <[^>]*> 14400084 bnez v0,0+001234 <bar> +[0-9a-f]+ <[^>]*> 00000000 nop + \.\.\. diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d new file mode 100644 index 0000000..2051cea --- /dev/null +++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n32.d @@ -0,0 +1,6 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: microMIPS link branch to absolute expression with addend (n32) +#source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute-addend.s +#as: -EB -n32 -march=from-abi +#ld: -EB -Ttext 0x12340000 -e foo +#dump: micromips-branch-absolute-addend.d diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d new file mode 100644 index 0000000..3814a0a --- /dev/null +++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend-n64.d @@ -0,0 +1,6 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: microMIPS link branch to absolute expression with addend (n64) +#source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute-addend.s +#as: -EB -64 -march=from-abi +#ld: -EB -Ttext 0x12340000 -e foo +#dump: micromips-branch-absolute-addend.d diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend.d new file mode 100644 index 0000000..ec78ff9 --- /dev/null +++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-addend.d @@ -0,0 +1,22 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: microMIPS link branch to absolute expression with addend +#source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute-addend.s +#as: -EB -32 +#ld: -EB -Ttext 0x12340000 -e foo + +.*: +file format .*mips.* + +Disassembly of section \.text: + \.\.\. +[0-9a-f]+ <[^>]*> 9400 2c54 b 0*123468ac <bar\+0x1233> +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 4060 2c51 bal 0*123468ac <bar\+0x1233> +[0-9a-f]+ <[^>]*> 0000 0000 nop +[0-9a-f]+ <[^>]*> 4020 2c4d bltzal zero,0*123468ac <bar\+0x1233> +[0-9a-f]+ <[^>]*> 0000 0000 nop +[0-9a-f]+ <[^>]*> 9402 2c49 beqz v0,0*123468ac <bar\+0x1233> +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> b402 2c46 bnez v0,0*123468ac <bar\+0x1233> +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 0c00 nop + \.\.\. diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n32.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n32.d new file mode 100644 index 0000000..7b1dd46 --- /dev/null +++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n32.d @@ -0,0 +1,6 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: microMIPS link branch to absolute expression (n32) +#source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute.s +#as: -EB -n32 -march=from-abi +#ld: -EB -Ttext 0 -e foo +#dump: micromips-branch-absolute.d diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n64.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n64.d new file mode 100644 index 0000000..e661935 --- /dev/null +++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute-n64.d @@ -0,0 +1,6 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: microMIPS link branch to absolute expression (n64) +#source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute.s +#as: -EB -64 -march=from-abi +#ld: -EB -Ttext 0 -e foo +#dump: micromips-branch-absolute.d diff --git a/ld/testsuite/ld-mips-elf/micromips-branch-absolute.d b/ld/testsuite/ld-mips-elf/micromips-branch-absolute.d new file mode 100644 index 0000000..f07ad1b --- /dev/null +++ b/ld/testsuite/ld-mips-elf/micromips-branch-absolute.d @@ -0,0 +1,22 @@ +#objdump: -dr --prefix-addresses --show-raw-insn +#name: microMIPS link branch to absolute expression +#source: ../../../gas/testsuite/gas/mips/micromips-branch-absolute.s +#as: -EB -32 +#ld: -EB -Ttext 0 -e foo + +.*: +file format .*mips.* + +Disassembly of section \.text: + \.\.\. +[0-9a-f]+ <[^>]*> 9400 0118 b 0+001234 <foo\+0x234> +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 4060 0115 bal 0+001234 <foo\+0x234> +[0-9a-f]+ <[^>]*> 0000 0000 nop +[0-9a-f]+ <[^>]*> 4020 0111 bltzal zero,0+001234 <foo\+0x234> +[0-9a-f]+ <[^>]*> 0000 0000 nop +[0-9a-f]+ <[^>]*> 9402 010d beqz v0,0+001234 <foo\+0x234> +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> b402 010a bnez v0,0+001234 <foo\+0x234> +[0-9a-f]+ <[^>]*> 0c00 nop +[0-9a-f]+ <[^>]*> 0c00 nop + \.\.\. diff --git a/ld/testsuite/ld-mips-elf/mips-elf.exp b/ld/testsuite/ld-mips-elf/mips-elf.exp index f4202f4..21867f1 100644 --- a/ld/testsuite/ld-mips-elf/mips-elf.exp +++ b/ld/testsuite/ld-mips-elf/mips-elf.exp @@ -143,12 +143,33 @@ run_dump_test "mips16-1" # MIPS branch offset final link checking. run_dump_test "branch-misc-1" run_dump_test "branch-misc-2" +run_dump_test "branch-absolute" [list [list ld $abi_ldflags(o32)]] +if $has_newabi { + run_dump_test "branch-absolute-n32" [list [list ld $abi_ldflags(n32)]] + run_dump_test "branch-absolute-addend-n32" \ + [list [list ld $abi_ldflags(n32)]] + run_dump_test "branch-absolute-n64" [list [list ld $abi_ldflags(n64)]] + run_dump_test "branch-absolute-addend-n64" \ + [list [list ld $abi_ldflags(n64)]] +} run_dump_test "mips16-branch-2" [list [list ld $abi_ldflags(o32)]] run_dump_test "mips16-branch-3" [list [list ld $abi_ldflags(o32)]] run_dump_test "mips16-branch-addend-2" [list [list ld $abi_ldflags(o32)]] run_dump_test "mips16-branch-addend-3" [list [list ld $abi_ldflags(o32)]] +run_dump_test "micromips-branch-absolute" [list [list ld $abi_ldflags(o32)]] +if $has_newabi { + run_dump_test "micromips-branch-absolute-n32" \ + [list [list ld $abi_ldflags(n32)]] + run_dump_test "micromips-branch-absolute-addend-n32" \ + [list [list ld $abi_ldflags(n32)]] + run_dump_test "micromips-branch-absolute-n64" \ + [list [list ld $abi_ldflags(n64)]] + run_dump_test "micromips-branch-absolute-addend-n64" \ + [list [list ld $abi_ldflags(n64)]] +} + # Jalx test run_dump_test "jalx-1" |