Fix excessive memory allocation attempts and possible integer overfloaws when attempt...

[deliverable/binutils-gdb.git] / bfd / elf32-rx.c

diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index c09fd9fc052de886da26711b216c6a40e240b13d..f81988b93238a27c1ec7b87a02654c3098de5bfb 100644 (file)
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -683,7 +683,7 @@ rx_elf_relocate_section
          && strcmp (name, "__romdatastart") != 0                       \
          && !saw_subtract)                                             \
        /* xgettext:c-format */                                         \
-       _bfd_error_handler (_("%B(%A): unsafe PID relocation %s at 0x%08lx (against %s in %s)"), \
+       _bfd_error_handler (_("%B(%A): unsafe PID relocation %s at %#Lx (against %s in %s)"), \
                            input_bfd, input_section, howto->name,      \
                            input_section->output_section->vma + input_section->output_offset + rel->r_offset, \
                            name, sec->name);                           \
@@ -3142,8 +3142,9 @@ rx_elf_merge_private_bfd_data (bfd * ibfd, struct bfd_link_info *info)
            }
          else
            {
-             _bfd_error_handler (_("There is a conflict merging the ELF header flags from %s"),
-                                 bfd_get_filename (ibfd));
+             _bfd_error_handler (_("There is a conflict merging the"
+                                   " ELF header flags from %B"),
+                                 ibfd);
              _bfd_error_handler (_("  the input  file's flags: %s"),
                                  describe_flags (new_flags));
              _bfd_error_handler (_("  the output file's flags: %s"),