From 6f112c47dc1a63ff7197355fe53a802385252697 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sun, 24 Jun 2001 16:43:31 +0000 Subject: [PATCH] * config/tc-alpha.c (tc_gen_reloc): Handle relocs against SEC_MERGE section symbols the same way as externs. --- gas/ChangeLog | 5 +++++ gas/config/tc-alpha.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 678dea5edef..8ce479f2d0f 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 ba42aaa8bcc..65bc4f87ef5 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 -- 2.30.2