tree b8efd23109dca6ff556affe705c4faf984d326a9
parent 96f2030e25e865286f3417372dab977005aff45b
author Joseph Myers <joseph@codesourcery.com> 1193917520 +0000
committer Joseph Myers <joseph@codesourcery.com> 1193917520 +0000

bfd:
	* merge.c (sec_merge_hash_lookup): Add parameter sec_end.  Check
	for unterminated strings.  All callers changed.
	(record_section): Add parameter abfd.  Give error message for
	unterminated strings.
	(_bfd_merge_sections): Update call to record_section.
	(_bfd_write_merged_section, _bfd_merged_section_offset): Handle
	NULL secinfo from merge failures.

ld/testsuite:
	* ld-elf/merge3.d, ld-elf/merge3.s: New.