Import this patch from the mainline:

	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 87498f0a546e96be40d3476a5d9c7e953eb49653..4ec85245eecf426f87f8dc7e88655ffa6a309b56 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,14 @@
+2012-04-20  Nick Clifton  <nickc@redhat.com>
+
+       Import this patch from the mainline:
+       2012-03-21  Eliot Dresselhaus  <eliot@sonic.net>
+
+       * elf32-tic6x.c (elf32_tic6x_merge_private_bfd_data): Return TRUE
+       for non-C6X objects.
+
 2012-02-01  Nick Clifton  <nickc@redhat.com>
 
-       * Import this patch from the mainline:
+       Import this patch from the mainline:
        2012-01-05  Nick Clifton  <nickc@redhat.com>
 
        PR ld/12161

diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 19287fec182f393c4ee2630262d16914cb17d242..44042eb1ae3a4f577eda9784759f85557e4b8c28 100644 (file)
--- a/bfd/elf32-tic6x.c
+++ b/bfd/elf32-tic6x.c
@@ -4018,6 +4018,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;