From 335a046fbde666eac289e1d6b227bc79d163a79f Mon Sep 17 00:00:00 2001 From: matt Date: Fri, 29 Jan 2010 06:05:53 +0000 Subject: [PATCH] Remove merge workaround - not needed. --- external/gpl3/binutils/dist/gas/write.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/external/gpl3/binutils/dist/gas/write.c b/external/gpl3/binutils/dist/gas/write.c index c4a2bb22f610..1af81a7df9ba 100644 --- a/external/gpl3/binutils/dist/gas/write.c +++ b/external/gpl3/binutils/dist/gas/write.c @@ -821,13 +821,10 @@ adjust_reloc_syms (bfd *abfd ATTRIBUTE_UNUSED, continue; } - /* Never adjust a reloc against local symbol in a merge section with - a non-negative addend or if the addend would place the relocation - outside the section's limits. */ + /* Never adjust a reloc against local symbol in a merge section + with non-zero addend. */ if ((symsec->flags & SEC_MERGE) != 0 - && (S_GET_VALUE(sym) + fixp->fx_offset < S_GET_VALUE(sym) - || S_GET_VALUE(sym) + fixp->fx_offset >= bfd_get_section_size(symsec) - || fixp->fx_subsy != NULL)) + && (fixp->fx_offset != 0 || fixp->fx_subsy != NULL)) continue; /* Never adjust a reloc against TLS local symbol. */