Module Name: src
Committed By: matt
Date: Fri Jan 29 06:05:53 UTC 2010
Modified Files:
src/external/gpl3/binutils/dist/gas: write.c
Log Message:
Remove merge workaround - not needed.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/gas/write.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/write.c
diff -u src/external/gpl3/binutils/dist/gas/write.c:1.3 src/external/gpl3/binutils/dist/gas/write.c:1.4
--- src/external/gpl3/binutils/dist/gas/write.c:1.3 Fri Jan 1 06:12:55 2010
+++ src/external/gpl3/binutils/dist/gas/write.c Fri Jan 29 06:05:53 2010
@@ -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. */
