summaryrefslogtreecommitdiff
path: root/bfd/elf32-tic6x.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-03-21 14:55:43 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-03-21 14:55:43 +0000
commit2ae5f673388aee2b3b4a455cb1efb22247e2ef0d (patch)
tree49f68c34bd9cfba2f69e97976838330be1fc4070 /bfd/elf32-tic6x.c
parentef4579720821a3927946f72e1313c68ee1cf81d6 (diff)
downloadbinutils-redhat-2ae5f673388aee2b3b4a455cb1efb22247e2ef0d.tar.gz
2012-03-21 Eliot Dresselhaus <eliot@sonic.net>
* elf32-tic6x.c (elf32_tic6x_merge_private_bfd_data): Return TRUE for non-C6X objects.
Diffstat (limited to 'bfd/elf32-tic6x.c')
-rw-r--r--bfd/elf32-tic6x.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/bfd/elf32-tic6x.c b/bfd/elf32-tic6x.c
index 6d6b59baac..8abfdd0271 100644
--- 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;