Module Name: src
Committed By: matt
Date: Tue Aug 25 23:29:40 UTC 2009
Modified Files:
src/gnu/dist/binutils/gas [matt-nb5-mips64]: write.c
Log Message:
Fix a problem with reloc against local symbols with addends in merge
sections. Modify the against merge sections to be against non-string
merge sections.
With this one line changes, libc.so can now be buit.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.32.1 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 src/gnu/dist/binutils/gas/write.c:1.1.1.3.32.1
--- src/gnu/dist/binutils/gas/write.c:1.1.1.3 Thu Feb 2 20:55:54 2006
+++ src/gnu/dist/binutils/gas/write.c Tue Aug 25 23:29:40 2009
@@ -847,9 +847,10 @@
continue;
}
- /* Never adjust a reloc against local symbol in a merge section
- with non-zero addend. */
+ /* Never adjust a reloc against local symbol in a non-string merge
+ section with non-zero addend. */
if ((symsec->flags & SEC_MERGE) != 0
+ && (symsec->flags & SEC_STRINGS) == 0
&& (fixp->fx_offset != 0 || fixp->fx_subsy != NULL))
continue;
