Module Name: src
Committed By: matt
Date: Thu Jan 28 18:39:55 UTC 2010
Modified Files:
src/gnu/dist/binutils/gas [matt-nb5-mips64]: write.c
Log Message:
Back out this change since we know see the ld problem when using the
ntrad{little,big}mips. "Never Mind"
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3.32.3 -r1.1.1.3.32.4 src/gnu/dist/binutils/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/gnu/dist/binutils/gas/write.c
diff -u src/gnu/dist/binutils/gas/write.c:1.1.1.3.32.3 src/gnu/dist/binutils/gas/write.c:1.1.1.3.32.4
--- src/gnu/dist/binutils/gas/write.c:1.1.1.3.32.3 Fri Jan 1 06:02:50 2010
+++ src/gnu/dist/binutils/gas/write.c Thu Jan 28 18:39:55 2010
@@ -847,14 +847,10 @@
continue;
}
- /* Never adjust a reloc against local symbol in a merge section with
- a non-zero addend 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
- && (fixp->fx_offset < 0
- || S_GET_VALUE(sym) + fixp->fx_offset >= bfd_get_section_size(symsec)
- || S_GET_VALUE(sym) + fixp->fx_offset < 0
- || fixp->fx_subsy != NULL))
+ && (fixp->fx_offset != 0 || fixp->fx_subsy != NULL))
continue;
/* Never adjust a reloc against TLS local symbol. */
