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

	* elf32-tic6x.c (elf32_tic6x_merge_private_bfd_data): Return TRUE
	for non-C6X objects.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 762633dfa6579e6fa8dc2d0e856b3781e94cb94f..da9f409dc83a0c02f48aa65bddf0ac00328306b5 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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

diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 6d6b59baac3a37d076a6a04e2db11adf3ab54f37..8abfdd0271b80e90bd6db4f1331439e11eb2d3a5 100644 (file)
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -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;