* 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 678dea5edef72e264c4d3f66c06c41f993bc579c..8ce479f2d0f9cd3a8ea391c7cff0ddb9a038b62c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -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>
 
        * 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 ba42aaa8bcc610b56976be784541007c3ee5dd2b..65bc4f87ef58732c9639d478cebc9e272bbf9f59 100644 (file)
--- 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