From: schwab <schwab>
Date: Sun, 20 Jun 2004 19:33:29 +0000 (+0000)
Subject: 	* config/tc-m68k.c (mri_chip): Replace current_chip, not augment.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7b7412d7664f2b718fd5f3f0df29af56a55707d8;p=pf3gnuchains%2Fpf3gnuchains3x.git

	* config/tc-m68k.c (mri_chip): Replace current_chip, not augment.
	(md_parse_option): Likewise.
---

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3d93a17952..c343418cb2 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-20  Andreas Schwab  <schwab@suse.de>
+
+	* config/tc-m68k.c (mri_chip): Replace current_chip, not augment.
+	(md_parse_option): Likewise.
+
 2004-06-17  Jan Beulich <jbeulich@novell.com>
 
 	* config/tc-i386.c: Deal with LEX_QM the same way as with LEX_AT.
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 69be532fd6..199fec5f96 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -5471,7 +5471,7 @@ mri_chip ()
   else
     current_architecture &= m68881 | m68851;
   current_architecture |= archs[i].arch;
-  current_chip |= archs[i].chip;
+  current_chip = archs[i].chip;
 
   while (*input_line_pointer == '/')
     {
@@ -7264,7 +7264,7 @@ md_parse_option (c, arg)
 		  {
 		    current_architecture &= ~m68000up;
 		    current_architecture |= arch;
-		    current_chip |= archs[i].chip;
+		    current_chip = archs[i].chip;
 		  }
 		else if (arch == m68881)
 		  {