Ooops - failed to check in first part of patch for PR 17438

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0a53dfbcbaa991e272494eda7f403f0d3bccab2e..8d0db524bb384257f1b8e49cb499630e2fb8f22a 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct  8 10:18:33 1998  Nick Clifton  <nickc@cygnus.com>
+
+       * config/tc-d30v.c (find_format): Test for missing flag and
+       control registers.
+
 Wed Oct  7 14:09:14 1998  Nick Clifton  <nickc@cygnus.com>
 
        * config/tc-d30v.c (md_apply_fix3): Do not assume that bad

diff --git a/gas/config/tc-d30v.c b/gas/config/tc-d30v.c
index a64e1a5c5a1692931bdfa2b297852ad43f2d33dd..73dcbe32a9919b6142c6346425c55d92a99975dd 100644 (file)
--- a/gas/config/tc-d30v.c
+++ b/gas/config/tc-d30v.c
@@ -1584,7 +1584,7 @@ find_format (opcode, myops, fsize, cmp_hack)
                      || ((flags & OPERAND_ACC) && !(num & OPERAND_ACC))
                      || (!(flags & OPERAND_ACC) && (num & OPERAND_ACC))
                      || ((flags & OPERAND_FLAG) && !(num & OPERAND_FLAG))
-                     || (!(flags & OPERAND_FLAG) && (num & OPERAND_FLAG))
+                     || (!(flags & (OPERAND_FLAG | OPERAND_CONTROL)) && (num & OPERAND_FLAG))
                      || ((flags & OPERAND_CONTROL)
                          && !(num & (OPERAND_CONTROL | OPERAND_FLAG))))
                    {