From 6cb37461704c73633ea02a98660234d251490f24 Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Tue, 12 Oct 2004 14:51:42 +0000 Subject: [PATCH] * elf32-arm.h (elf32_arm_merge_private_bfd_data): Rephrase error message. --- bfd/ChangeLog | 5 +++++ bfd/elf32-arm.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index af51a0682..4dc9458da 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2004-10-12 Paul Brook + * elf32-arm.h (elf32_arm_merge_private_bfd_data): Rephrase error + message. + +2004-10-12 Paul Brook + * elf32-arm.h: Support EABI version 4 objects. 2004-10-12 Alan Modra diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index a793d0921..c51cdeb1a 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); -- 2.11.4.GIT