aboutsummaryrefslogtreecommitdiff
path: root/gas
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2004-06-20 19:33:29 +0000
committerAndreas Schwab <schwab@linux-m68k.org>2004-06-20 19:33:29 +0000
commit990ae22a1e3262ab12ebe13164066349273b0c7c (patch)
tree944bd235192acb1f7f6b14d9936bef6d175b45fa /gas
parent66d659b12a75b0275839472b41528d7f52f1eeb8 (diff)
downloadgdb-990ae22a1e3262ab12ebe13164066349273b0c7c.zip
gdb-990ae22a1e3262ab12ebe13164066349273b0c7c.tar.gz
gdb-990ae22a1e3262ab12ebe13164066349273b0c7c.tar.bz2
* config/tc-m68k.c (mri_chip): Replace current_chip, not augment.
(md_parse_option): Likewise.
Diffstat (limited to 'gas')
-rw-r--r--gas/ChangeLog5
-rw-r--r--gas/config/tc-m68k.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3d93a17..c343418 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 69be532..199fec5 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)
{