diff options
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elf32-arm.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index af51a068220..4dc9458dae4 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2004-10-12 Paul Brook <paul@codesourcery.com> + * elf32-arm.h (elf32_arm_merge_private_bfd_data): Rephrase error + message. + +2004-10-12 Paul Brook <paul@codesourcery.com> + * elf32-arm.h: Support EABI version 4 objects. 2004-10-12 Alan Modra <amodra@bigpond.net.au> diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index a793d0921f8..c51cdeb1a50 100644 --- a/bfd/elf32-arm.h +++ b/bfd/elf32-arm.h @@ -2504,7 +2504,7 @@ elf32_arm_merge_private_bfd_data (bfd * ibfd, bfd * obfd) if (EF_ARM_EABI_VERSION (in_flags) != EF_ARM_EABI_VERSION (out_flags)) { _bfd_error_handler - (_("ERROR: %B is compiled for EABI version %d, whereas %B is compiled for version %d"), + (_("ERROR: Source object %B has EABI version %d, but target %B has EABI version %d"), ibfd, obfd, (in_flags & EF_ARM_EABIMASK) >> 24, (out_flags & EF_ARM_EABIMASK) >> 24); |