From: Alan Modra <amodra@gmail.com>
Date: Wed, 20 Nov 2002 13:11:01 +0000 (+0000)
Subject: 	* write.c (adjust_reloc_syms): Don't reduce SEC_MERGE fixups with
X-Git-Tag: binutils-2_13_2~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=353903054afcd43712f5009d05d0c548146417aa;p=thirdparty%2Fbinutils-gdb.git

	* write.c (adjust_reloc_syms): Don't reduce SEC_MERGE fixups with
	fx_subsy non-NULL.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0b8750c3c6d..94223d03ce8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-20  Alan Modra  <amodra@bigpond.net.au>
+
+	* write.c (adjust_reloc_syms): Don't reduce SEC_MERGE fixups with
+	fx_subsy non-NULL.
+
 2002-11-19  Richard Henderson  <rth@redhat.com>
 
 	* config/obj-elf.c (obj_elf_visibility): Overwrite only the
diff --git a/gas/write.c b/gas/write.c
index 323b95f83ce..f8120cbc7c7 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -881,7 +881,8 @@ adjust_reloc_syms (abfd, sec, xxx)
 
 	/* Never adjust a reloc against local symbol in a merge section
 	   with non-zero addend.  */
-	if ((symsec->flags & SEC_MERGE) && fixp->fx_offset)
+	if ((symsec->flags & SEC_MERGE) != 0
+	    && (fixp->fx_offset != 0 || fixp->fx_subsy != NULL))
 	  {
 	    symbol_mark_used_in_reloc (fixp->fx_addsy);
 	    goto done;