* config/tc-alpha.c (tc_gen_reloc): Handle relocs against SEC_MERGE

section symbols the same way as externs.
This commit is contained in:
Jakub Jelinek
2001-06-24 16:43:31 +00:00
parent 6d900bf62c
commit 6f112c47dc
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2001-06-24 Jakub Jelinek <jakub@redhat.com>
* config/tc-alpha.c (tc_gen_reloc): Handle relocs against SEC_MERGE
section symbols the same way as externs.
2001-06-24 Ben Elliston <bje@redhat.com> 2001-06-24 Ben Elliston <bje@redhat.com>
* config/tc-m88k.c (md_number_to_imm): Remove; unused since 1993. * config/tc-m88k.c (md_number_to_imm): Remove; unused since 1993.

View File

@ -1591,7 +1591,8 @@ tc_gen_reloc (sec, fixp)
* at assembly time. bfd_perform_reloc doesn't know about this sort * at assembly time. bfd_perform_reloc doesn't know about this sort
* of thing, and as a result we need to fake it out here. * of thing, and as a result we need to fake it out here.
*/ */
if ((S_IS_EXTERN (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy)) if ((S_IS_EXTERN (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy)
|| (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE))
&& !S_IS_COMMON (fixp->fx_addsy)) && !S_IS_COMMON (fixp->fx_addsy))
reloc->addend -= symbol_get_bfdsym (fixp->fx_addsy)->value; reloc->addend -= symbol_get_bfdsym (fixp->fx_addsy)->value;
#endif #endif