From 8350bcd967852fa3d68b8d935331fe2b3e81bbfe Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 4 Dec 2001 11:28:29 +0000 Subject: [PATCH] Only clear cpu part when specifying 'xscale' cpu (don't change the fpu part) --- gas/ChangeLog | 5 +++++ gas/config/tc-arm.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 4f40f803172..b9c001f8984 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2001-12-03 Jeroen Dobbelaere + + * config/tc-arm.c (md_parse_option): Only clear cpu part when + specifying 'xscale' cpu (don't change the fpu part). + 2001-12-04 Alexandre Oliva * config/tc-d10v.c (find_opcode): Reject SP operand if diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c index 429cfa5da65..62c4bceeb87 100644 --- a/gas/config/tc-arm.c +++ b/gas/config/tc-arm.c @@ -8988,7 +8988,8 @@ md_parse_option (c, arg) case 'x': if (streq (str, "xscale")) - cpu_variant = ARM_9 | ARM_ARCH_XSCALE; + cpu_variant = (cpu_variant & ~ARM_ANY) + | ARM_9 | ARM_ARCH_XSCALE; else goto bad; break; -- 2.30.2