From: Jakub Jelinek Date: Sun, 24 Jun 2001 16:43:31 +0000 (+0000) Subject: * config/tc-alpha.c (tc_gen_reloc): Handle relocs against SEC_MERGE X-Git-Tag: gprof-pre-ansify-2004-05-26~6455 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=71fcca1215c1cf4504415dce74bfb854eb74dd4c;p=pf3gnuchains%2Fpf3gnuchains4x.git * config/tc-alpha.c (tc_gen_reloc): Handle relocs against SEC_MERGE section symbols the same way as externs. --- diff --git a/gas/ChangeLog b/gas/ChangeLog index 678dea5ede..8ce479f2d0 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2001-06-24 Jakub Jelinek + + * config/tc-alpha.c (tc_gen_reloc): Handle relocs against SEC_MERGE + section symbols the same way as externs. + 2001-06-24 Ben Elliston * config/tc-m88k.c (md_number_to_imm): Remove; unused since 1993. diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c index ba42aaa8bc..65bc4f87ef 100644 --- a/gas/config/tc-alpha.c +++ b/gas/config/tc-alpha.c @@ -1591,7 +1591,8 @@ tc_gen_reloc (sec, fixp) * 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. */ - 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)) reloc->addend -= symbol_get_bfdsym (fixp->fx_addsy)->value; #endif