* config/tc-mn10300.c (HAVE_AM30): Define.

(md_assemble): Use it.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 32c5f4730bafa7bc43190e72ddfc2e46286ea53b..feeb71fc3bc48d50320fbf1b5f95e92529aba04c 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-20  Alexandre Oliva  <aoliva@cygnus.com>
+
+       * config/tc-mn10300.c (HAVE_AM30): Define.
+       (md_assemble): Use it.
+
 2000-04-19  Alan Modra  <alan@linuxcare.com.au>
 
        * config/obj-elf.c (obj_elf_change_section): Check for changed

diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c
index ae1ea16fe7b128a227ca47a324fdaed5a0ce0e60..3514f9f19701882d775784aae813308e3dd68e6b 100644 (file)
--- a/gas/config/tc-mn10300.c
+++ b/gas/config/tc-mn10300.c
@@ -125,6 +125,7 @@ const pseudo_typeS md_pseudo_table[] =
 };
 
 #define HAVE_AM33 (current_machine == AM33)
+#define HAVE_AM30 (current_machine == AM30)
 
 /* Opcode hash table.  */
 static struct hash_control *mn10300_hash;
@@ -944,7 +945,8 @@ md_assemble (str)
       /* If the instruction is not available on the current machine
         then it can not possibly match.  */
       if (opcode->machine
-         && !(opcode->machine == AM33 && HAVE_AM33))
+         && !(opcode->machine == AM33 && HAVE_AM33)
+         && !(opcode->machine == AM30 && HAVE_AM30))
        goto error;
 
       for (op_idx = 1, opindex_ptr = opcode->operands;