* elf.c (_bfd_elf_rela_local_sym): New.

[deliverable/binutils-gdb.git] / gas / config / tc-alpha.c

diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index f73c8628e477229e1a591b86009105b2c9705fa9..f9908e7924ac1553383bf27080efe6770d7e49ad 100644 (file)
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -1507,8 +1507,7 @@ 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)
-          || (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE))
+      if ((S_IS_EXTERN (fixp->fx_addsy) || S_IS_WEAK (fixp->fx_addsy))
          && !S_IS_COMMON (fixp->fx_addsy))
        reloc->addend -= symbol_get_bfdsym (fixp->fx_addsy)->value;
 #endif