2012-03-21 Eliot Dresselhaus <eliot@sonic.net>

* elf32-tic6x.c (elf32_tic6x_merge_private_bfd_data): Return TRUE
	for non-C6X objects.
This commit is contained in:
Joseph Myers 2012-03-21 14:55:45 +00:00
parent a5362b9aa4
commit b781d74fe1
2 changed files with 8 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2012-03-21 Eliot Dresselhaus <eliot@sonic.net>
* elf32-tic6x.c (elf32_tic6x_merge_private_bfd_data): Return TRUE
for non-C6X objects.
2012-03-20 Kai Tietz <ktietz@redhat.com>
PR ld/12742

View File

@ -4011,6 +4011,9 @@ elf32_tic6x_merge_private_bfd_data (bfd *ibfd, bfd *obfd)
if (!_bfd_generic_verify_endian_match (ibfd, obfd))
return FALSE;
if (! is_tic6x_elf (ibfd) || ! is_tic6x_elf (obfd))
return TRUE;
if (!elf32_tic6x_merge_attributes (ibfd, obfd))
return FALSE;