Only clear cpu part when specifying 'xscale' cpu (don't change the fpu part)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4f40f803172b3c973aa59c19b507837624ddd097..b9c001f898434312abb9f9a99e33454182ac845a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-03  Jeroen Dobbelaere  <jeroen.dobbelaere@acunia.com>
+
+       * 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  <aoliva@redhat.com>
 
        * 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 429cfa5da65795b064e40904081462e757bab0db..62c4bceeb8749e93c31c6a400f36a39a29cf200b 100644 (file)
--- 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;