[src/trunk]: src/external/gpl3/binutils/dist/gas Remove merge workaround - no...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/00c69bdbdc31
branches:  trunk
changeset: 751234:00c69bdbdc31
user:      matt <matt%NetBSD.org@localhost>
date:      Fri Jan 29 06:05:53 2010 +0000

description:
Remove merge workaround - not needed.

diffstat:

 external/gpl3/binutils/dist/gas/write.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (20 lines):

diff -r 396bd8254f6c -r 00c69bdbdc31 external/gpl3/binutils/dist/gas/write.c
--- a/external/gpl3/binutils/dist/gas/write.c   Fri Jan 29 06:05:32 2010 +0000
+++ b/external/gpl3/binutils/dist/gas/write.c   Fri Jan 29 06:05:53 2010 +0000
@@ -821,13 +821,10 @@
              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.  */