diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-rl78.c | 16 |
2 files changed, 22 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 3c0aa71..de40fb7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2014-05-16 Kaushik Phata <Kaushik.Phatak@kpit.com> + + * elf32-rl78.c (rl78_elf_merge_private_bfd_data): Complain if + 64-bit doubles objects mix with 32-bit doubles objects. + (rl78_elf_print_private_bfd_data): Describe 64-bit doubles flag. + 2014-05-08 Hans-Peter Nilsson <hp@bitrange.com> * mmo.c: Update URLs in documentation comments. diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c index 7b66971..5e62edd 100644 --- a/bfd/elf32-rl78.c +++ b/bfd/elf32-rl78.c @@ -1049,6 +1049,19 @@ rl78_elf_merge_private_bfd_data (bfd * ibfd, bfd * obfd) (*_bfd_error_handler) (_("- %s is G10, %s is not"), bfd_get_filename (ibfd), bfd_get_filename (obfd)); } + + if (changed_flags & E_FLAG_RL78_64BIT_DOUBLES) + { + (*_bfd_error_handler) + (_("RL78 merge conflict: cannot link 32-bit and 64-bit objects together")); + + if (old_flags & E_FLAG_RL78_64BIT_DOUBLES) + (*_bfd_error_handler) (_("- %s is 64-bit, %s is not"), + bfd_get_filename (obfd), bfd_get_filename (ibfd)); + else + (*_bfd_error_handler) (_("- %s is 64-bit, %s is not"), + bfd_get_filename (ibfd), bfd_get_filename (obfd)); + } } return !error; @@ -1071,6 +1084,9 @@ rl78_elf_print_private_bfd_data (bfd * abfd, void * ptr) if (flags & E_FLAG_RL78_G10) fprintf (file, _(" [G10]")); + if (flags & E_FLAG_RL78_64BIT_DOUBLES) + fprintf (file, _(" [64-bit doubles]")); + fputc ('\n', file); return TRUE; } |