diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-tic6x.c | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 762633d..da9f409 100644 --- 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 6d6b59b..8abfdd0 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; |