diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-v850.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 88b7b862e94..77e33e4e05a 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2015-10-15 Alan Modra <amodra@gmail.com> + + * elf32-v850.c (v850_elf_copy_private_bfd_data): Remove assertion + that input and output .note.renesas sections are same size. + Instead, only copy input to output if they are. + 2015-10-15 Riku Voipio <riku.voipio@iki.fi> PR ld/19123 diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c index c6a6d2fa7af..47733243da6 100644 --- a/bfd/elf32-v850.c +++ b/bfd/elf32-v850.c @@ -2442,13 +2442,14 @@ v850_elf_copy_private_bfd_data (bfd * ibfd, bfd * obfd) if ((onotes = bfd_get_section_by_name (obfd, V850_NOTE_SECNAME)) == NULL) return TRUE; - if ((inotes = bfd_get_section_by_name (ibfd, V850_NOTE_SECNAME)) != NULL) + if ((inotes = bfd_get_section_by_name (ibfd, V850_NOTE_SECNAME)) == NULL) + return TRUE; + + if (bfd_section_size (ibfd, inotes) == bfd_section_size (obfd, onotes)) { bfd_byte * icont; bfd_byte * ocont; - BFD_ASSERT (bfd_section_size (ibfd, inotes) == bfd_section_size (obfd, onotes)); - if ((icont = elf_section_data (inotes)->this_hdr.contents) == NULL) BFD_ASSERT (bfd_malloc_and_get_section (ibfd, inotes, & icont)); |