From: Nick Clifton <nickc@redhat.com>
Date: Tue, 4 Dec 2001 11:28:29 +0000 (+0000)
Subject: Only clear cpu part when specifying 'xscale' cpu (don't change the fpu part)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8350bcd967852fa3d68b8d935331fe2b3e81bbfe;p=binutils-gdb.git

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

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  <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 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;