From 5a21e886d091185d04d54ffcead68efe5d57b076 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 21 Oct 2003 14:20:40 +0000 Subject: [PATCH] Fix up error messages for Maverick. --- bfd/ChangeLog | 5 +++++ bfd/elf32-arm.h | 2 +- gas/ChangeLog | 6 ++++++ gas/config/tc-arm.c | 4 ++-- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 85f71748eb1..119a8c0076b 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2003-10-21 Wouter van Heyst + + * elf32-arm.h (elf32_arm_merge_private_bfd_data): Correct text + describing mismatched formats involving the Maverick FP type. + 2003-10-21 Anil Paranjpe * binary.c (binary_object_p): Pass machine flag along with diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h index a28c558f1db..15eb478a295 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)); diff --git a/gas/ChangeLog b/gas/ChangeLog index 0c61c8b3109..c688eb41a8d 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2003-10-21 Wouter van Heyst + + * config/tc-arm.c (all_reg_maps): Correct text describing Maverick + register requirements. + (md_begin): Remove F_SOFT_FLOAT if enabling MAVERICK FP. + 2003-10-21 Peter Barada Bernardo Innocenti diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 6db23f33a9a..ac8908a9ba4 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -769,7 +769,7 @@ struct reg_map all_reg_maps[] = {mav_mvf_table, 15, NULL, N_("Maverick MVF register expected")}, {mav_mvd_table, 15, NULL, N_("Maverick MVD register expected")}, {mav_mvfx_table, 15, NULL, N_("Maverick MVFX register expected")}, - {mav_mvdx_table, 15, NULL, N_("Maverick MVFX register expected")}, + {mav_mvdx_table, 15, NULL, N_("Maverick MVDX register expected")}, {mav_mvax_table, 3, NULL, N_("Maverick MVAX register expected")}, {mav_dspsc_table, 0, NULL, N_("Maverick DSPSC register expected")}, {iwmmxt_table, 23, NULL, N_("Intel Wireless MMX technology register expected")}, @@ -10320,7 +10320,7 @@ md_begin () #if defined OBJ_ELF if (cpu_variant & ARM_CEXT_MAVERICK) { - flags ^= F_SOFT_FLOAT; + flags &= ~ F_SOFT_FLOAT; flags |= EF_ARM_MAVERICK_FLOAT; } #endif -- 2.30.2