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

	(md_parse_option): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3d93a17952671e7fc4398e80234596b0bacfc1bb..c343418cb29050ad9a3580fea9d14c3422d5f789 100644 (file)
--- 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 69be532fd6cdd08da187da71b5f8119ca37dd798..199fec5f96835ee9966bd2f38a229a47fb987fb8 100644 (file)
--- 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)
                  {