aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf32-arm.h2
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/config/tc-arm.c4
4 files changed, 14 insertions, 3 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));
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0c61c8b..c688eb4 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-21 Wouter van Heyst <wouter@vidicode.nl>
+
+ * 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 <pbarada@mail.wm.sps.mot.com>
Bernardo Innocenti <bernie@develer.com>
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 6db23f3..ac8908a 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