diff options
| author | Nick Clifton <nickc@redhat.com> | 2006-05-11 08:48:58 +0000 |
|---|---|---|
| committer | Nick Clifton <nickc@redhat.com> | 2006-05-11 08:48:58 +0000 |
| commit | 53baae4870e8c05901fc63c7ee999492f10c2b87 (patch) | |
| tree | 83570d6ac757909f7197a1676a5e6f12ee79c51c /gas | |
| parent | ad623ec6b4fd99d72ccd621cfe455d1f6f58d28d (diff) | |
| download | fsf-binutils-gdb-53baae4870e8c05901fc63c7ee999492f10c2b87.zip fsf-binutils-gdb-53baae4870e8c05901fc63c7ee999492f10c2b87.tar.gz fsf-binutils-gdb-53baae4870e8c05901fc63c7ee999492f10c2b87.tar.bz2 | |
Apply fixes to allow arm WinCE toolchain to produce working executables.
Diffstat (limited to 'gas')
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/config/tc-arm.c | 27 |
2 files changed, 30 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 4596052..9b08640 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2006-05-11 Pedro Alves <pedro_alves@portugalmail.pt> + + * config/tc-arm.c (md_pcrel_from_section): Force a bias for + relocs against external symbols for WinCE targets. + (md_apply_fix): Likewise. + 2006-05-09 David Ung <davidu@mips.com> * config/tc-mips.c (append_insn): Only warn about an out-of-range diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 5ccbfc1..690f59f 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -15561,10 +15561,16 @@ md_pcrel_from_section (fixS * fixP, segT seg) /* If this is pc-relative and we are going to emit a relocation then we just want to put out any pipeline compensation that the linker - will need. Otherwise we want to use the calculated base. */ + will need. Otherwise we want to use the calculated base. + For WinCE we skip the bias for externals as well, since this + is how the MS ARM-CE assembler behaves and we want to be compatible. */ if (fixP->fx_pcrel && ((fixP->fx_addsy && S_GET_SEGMENT (fixP->fx_addsy) != seg) - || arm_force_relocation (fixP))) + || (arm_force_relocation (fixP) +#ifdef TE_WINCE + && !S_IS_EXTERNAL (fixP->fx_addsy) +#endif + ))) base = 0; switch (fixP->fx_r_type) @@ -15601,6 +15607,17 @@ md_pcrel_from_section (fixS * fixP, segT seg) case BFD_RELOC_ARM_PCREL_BLX: case BFD_RELOC_ARM_PLT32: #ifdef TE_WINCE + /* When handling fixups immediately, because we have already + discovered the value of a symbol, or the address of the frag involved + we must account for the offset by +8, as the OS loader will never see the reloc. + see fixup_segment() in write.c + The S_IS_EXTERNAL test handles the case of global symbols. + Those need the calculated base, not just the pipe compensation the linker will need. */ + if (fixP->fx_pcrel + && fixP->fx_addsy != NULL + && (S_GET_SEGMENT (fixP->fx_addsy) == seg) + && (S_IS_EXTERNAL (fixP->fx_addsy) || !arm_force_relocation (fixP))) + return base + 8; return base; #else return base + 8; @@ -16512,7 +16529,11 @@ md_apply_fix (fixS * fixP, case BFD_RELOC_ARM_SBREL32: case BFD_RELOC_32_PCREL: if (fixP->fx_done || !seg->use_rela_p) - md_number_to_chars (buf, value, 4); +#ifdef TE_WINCE + /* For WinCE we only do this for pcrel fixups. */ + if (fixP->fx_done || fixP->fx_pcrel) +#endif + md_number_to_chars (buf, value, 4); break; #ifdef OBJ_ELF |