aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 85f7174..119a8c0 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-21 Wouter van Heyst <wouter@vidicode.nl>
+
+ * elf32-arm.h (elf32_arm_merge_private_bfd_data): Correct text
+ describing mismatched formats involving the Maverick FP type.
+
2003-10-21 Anil Paranjpe <anilp1@KPITCummins.com>
* binary.c (binary_object_p): Pass machine flag along with
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index a28c558..15eb478 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -2351,7 +2351,7 @@ ERROR: %s uses Maverick instructions, whereas %s does not"),
bfd_get_filename (obfd));
else
_bfd_error_handler (_("\
-ERROR: %s uses Maverick instructions, whereas %s does not"),
+ERROR: %s does not use Maverick instructions, whereas %s does"),
bfd_archive_filename (ibfd),
bfd_get_filename (obfd));