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

	message.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index af51a06822086e1e6c9b4b72cc836633c2aab8b2..4dc9458dae441620f78d01eade219cdcba73ebd5 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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.

diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index a793d0921f8399bed0fd2e21bdfd91aaf1a82552..c51cdeb1a50f2df23dbc6848bccb3fd024e4beae 100644 (file)
--- 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);