* elf32-tic6x.c (elf32_tic6x_merge_private_bfd_data): Return TRUE
for non-C6X objects.
+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
2012-03-20 Kai Tietz <ktietz@redhat.com>
PR ld/12742
if (!_bfd_generic_verify_endian_match (ibfd, obfd))
return FALSE;
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;
if (!elf32_tic6x_merge_attributes (ibfd, obfd))
return FALSE;