Fixed a pcrel relocte miss between different section in the same module.

This commit is contained in:
Nick Clifton 2004-11-29 15:09:28 +00:00
parent 68800d83ae
commit a7498ae6da
7 changed files with 66 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2004-11-29 Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
* config/tc-m32r.c (md_pcrel_from_section): Fixed a pcrel relocte
miss between different section in the same module.
(tc_gen_reloc): Likewise.
2004-11-25 Theodore A. Roth <troth@openavr.org>
* gas/config/tc-avr.c (mcu_types): Add support for atmega165,

View File

@ -1999,6 +1999,12 @@ md_pcrel_from_section (fixP, sec)
|| S_IS_EXTERNAL (fixP->fx_addsy)
|| S_IS_WEAK (fixP->fx_addsy)))
{
if (S_GET_SEGMENT (fixP->fx_addsy) != sec
&& S_IS_DEFINED (fixP->fx_addsy)
&& ! S_IS_EXTERNAL (fixP->fx_addsy)
&& ! S_IS_WEAK (fixP->fx_addsy))
return fixP->fx_offset;
/* The symbol is undefined (or is defined but not in this section).
Let the linker figure it out. */
return 0;
@ -2488,7 +2494,7 @@ printf(" => %s\n",reloc->howto->name);
&& ! S_IS_EXTERNAL(fixP->fx_addsy)
&& ! S_IS_WEAK(fixP->fx_addsy))
/* Already used fx_offset in the opcode field itseld. */
reloc->addend = 0;
reloc->addend = fixP->fx_offset;
else
reloc->addend = fixP->fx_addnumber;

View File

@ -1,3 +1,11 @@
2004-11-29 Kazuhiro Inaoka <inaoka.kazuhiro@renesas.com>
* testsuite/gas/m32r/rela-1.s: New test.
* testsuite/gas/m32r/rela-1.d: Expected disassembly.
* testsuite/gas/m32r/m32r.exp: Run the new test.
* testsuite/gas/m32r/relax-1.d: Update for fixed pcrel reloc
generation.
2004-11-27 Richard Earnshaw <rearnsha@arm.com>
* gas/testsuite/arm/thumbv6.d (setend): Remove stray tab at end

View File

@ -7,4 +7,5 @@ if [istarget m32r*-*-*] {
run_dump_test "fslot"
run_dump_test "signed-relocs"
run_dump_test "seth"
run_dump_test "rela-1"
}

View File

@ -0,0 +1,24 @@
#as:
#objdump: -dr
#name: rela-1
.*: +file format .*
Disassembly of section .text:
0+0000 <.text>:
0: fe 00 00 00 bl 0 <.text>
0: R_M32R_26_PCREL_RELA .text2\+0x8
4: fe 00 00 00 bl 4 <.text\+0x4>
4: R_M32R_26_PCREL_RELA .text2\+0x8
8: 7e 00 f0 00 bl 8 <.text\+0x8> \|\| nop
8: R_M32R_10_PCREL_RELA .text2\+0x8
c: b0 90 00 00 bnez r0,c <.text\+0xc>
c: R_M32R_18_PCREL_RELA .text2\+0x8
10: 10 80 7e 00 mv r0,r0 -> bl 10 <.text\+0x10>
12: R_M32R_10_PCREL_RELA .text2\+0x8
Disassembly of section .text2:
0+0000 <label-0x8>:
0: 70 00 70 00 nop -> nop
4: 70 00 70 00 nop -> nop

View File

@ -0,0 +1,18 @@
.section .text
bl label
bl.l label
bl.s label
bnez r0,label
mv r0,r0
bl.s label
.section .text2, "ax"
nop
nop
nop
nop
label:
.end

View File

@ -14,5 +14,5 @@ Disassembly of section .text:
Disassembly of section .branch:
0* <branch>:
*0: ff 00 00 01 bra 4 <Work>
[ ]*0: R_M32R_26_PCREL_RELA .text
*0: ff 00 00 00 bra 0 <branch>
[ ]*0: R_M32R_26_PCREL_RELA .text\+0x4