Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove merge workaround - not needed.

This commit is contained in:
matt 2010-01-29 06:05:53 +00:00
parent fade670606
commit 335a046fbd
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
external/gpl3/binutils/dist/gas/write.c vendored
View File

@ -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. */