diff options
author | obrien <obrien@FreeBSD.org> | 2002-12-02 09:06:04 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2002-12-02 09:06:04 +0000 |
commit | 4f4b0b5073010ff850cc95a6bd074066eeb7dccb (patch) | |
tree | b6de1df6076881154726637e90c9d9bae94bab79 /contrib/binutils/gas/write.c | |
parent | 70d0c6024ff722929b55e70683c5bb4bd3d3b07f (diff) | |
download | FreeBSD-src-4f4b0b5073010ff850cc95a6bd074066eeb7dccb.zip FreeBSD-src-4f4b0b5073010ff850cc95a6bd074066eeb7dccb.tar.gz |
Import of Binutils from the FSF 2.13 branch (just pre-.2 release).
These bits are taken from the FSF anoncvs repo on 27-Oct-2002 21:12:00 EST.
Diffstat (limited to 'contrib/binutils/gas/write.c')
-rw-r--r-- | contrib/binutils/gas/write.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/binutils/gas/write.c b/contrib/binutils/gas/write.c index 323b95f..f8120cb 100644 --- a/contrib/binutils/gas/write.c +++ b/contrib/binutils/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; |