aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2001-12-04 11:28:29 +0000
committerNick Clifton <nickc@redhat.com>2001-12-04 11:28:29 +0000
commit8350bcd967852fa3d68b8d935331fe2b3e81bbfe (patch)
treeb9d3e6c0c06c1cde6a8602f2d4251c897f2a95c8 /gas
parent2888ec15451bc70db83060bdaec3f1dd8eaf11e4 (diff)
downloadgdb-8350bcd967852fa3d68b8d935331fe2b3e81bbfe.zip
gdb-8350bcd967852fa3d68b8d935331fe2b3e81bbfe.tar.gz
gdb-8350bcd967852fa3d68b8d935331fe2b3e81bbfe.tar.bz2
Only clear cpu part when specifying 'xscale' cpu (don't change the fpu part)
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-arm.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4f40f80..b9c001f 100644
--- 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 429cfa5..62c4bce 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;