* elf32-arm.h (elf32_arm_merge_private_bfd_data): Rephrase error

message.
This commit is contained in:
Paul Brook 2004-10-12 14:51:42 +00:00
parent 0eb3658b8f
commit 3656d5e3c7
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
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.

View File

@ -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);