darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gas/

Browse source 
* config/tc-ppc.c (md_apply_fix): Handle defined after use toc
	symbols.

gas/testsuite/
	* gas/ppc/aix.exp: Run xcoff-toc-1 test.
	* gas/ppc/xcoff-toc-1.s, gas/ppc/xcoff-toc-1.d: New test.
This commit is contained in:
Tristan Gingold 2013-09-04 12:28:11 +00:00
parent 74db7efbe3
commit ac21e7da5d
6 changed files with 56 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gas/ChangeLog
View file

@ -1,3 +1,8 @@
2013-09-04 Tristan Gingold <gingold@adacore.com>
* config/tc-ppc.c (md_apply_fix): Handle defined after use toc
symbols.
2013-09-04 Roland McGrath <mcgrathr@google.com>
PR gas/15914

12
gas/config/tc-ppc.c
View file

@ -3146,6 +3146,7 @@ md_assemble (char *str)
&& (operand->bitm & 0xfff0) == 0xfff0
&& operand->shift == 0)
{
/* Note: the symbol may be not yet defined. */
if (ppc_is_toc_sym (ex.X_add_symbol))
{
reloc = BFD_RELOC_PPC_TOC16;
@ -6363,6 +6364,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
value = fixP->fx_offset;
fixP->fx_done = 1;
}
/* During parsing of instructions, a TOC16 reloc is generated for
instructions such as 'lwz RT,SYM(RB)' if SYM is a symbol defined
in the toc. But at parse time, SYM may be not yet defined, so
check again here. */
if (fixP->fx_r_type == BFD_RELOC_16
&& fixP->fx_addsy != NULL
&& ppc_is_toc_sym (fixP->fx_addsy))
fixP->fx_r_type = BFD_RELOC_PPC_TOC16;
#endif
}
@ -6873,6 +6883,8 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
fixP->fx_addnumber =
- bfd_get_section_vma (stdoutput, S_GET_SEGMENT (fixP->fx_addsy))
- S_GET_VALUE (ppc_toc_csect);
/* Set *valP to avoid errors. */
*valP = value;
#endif
}
#endif

5
gas/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2013-09-04 Tristan Gingold <gingold@adacore.com>
* gas/ppc/aix.exp: Run xcoff-toc-1 test.
* gas/ppc/xcoff-toc-1.s, gas/ppc/xcoff-toc-1.d: New test.
2013-09-04 Roland McGrath <mcgrathr@google.com>
PR gas/15914

1
gas/testsuite/gas/ppc/aix.exp
View file

@ -67,6 +67,7 @@ if [istarget powerpc-ibm-aix*] then {
run_dump_test "xcoff-branch-1-64"
run_dump_test "xcoff-br16-1"
run_dump_test "xcoff-br16-2"
run_dump_test "xcoff-toc-1"
run_list_test "xcoff-ref-1"

12
gas/testsuite/gas/ppc/xcoff-toc-1.d Normal file
View file

@ -0,0 +1,12 @@
#as: -a32
#source: xcoff-toc-1.s
#objdump: -dr
#name: XCOFF TOC reloc test 1
.*
Disassembly of section \.text:
00000000 <\.foo>:
0: 80 22 00 00 l r1,0\(r2\)
2: R_TOC data-0x10010
4: 4e 80 00 20 br

21
gas/testsuite/gas/ppc/xcoff-toc-1.s Normal file
View file

@ -0,0 +1,21 @@
.csect _rw_[RW],4
.toc
.csect .text[PR]
.align 2
.lglobl .foo
.csect foo[DS]
foo:
.long .foo, TOC[tc0], 0
.csect .text[PR]
.foo:
lwz 1,LC..72(2)
blr
.align 2
.toc
LC..72:
.tc data[TC],data
.csect _rw_[RW],4
.align 2
data:
.space 0x10000