Allow duplicate cmp instructions for -mcom

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 50303a50acaca6a36c6dce5544a2758bf63be711..67c108e50740dc22e1bb004dee94b83f0ce46535 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 16 07:07:37 1995  Michael Meissner  <meissner@wogglebug.tiac.net>
+
+       * config/tc-ppc.c (md_begin): Take -mcom into account for
+       duplicate cmp instructions.
+
 Sun Oct 15 22:06:14 1995  Michael Meissner  <meissner@cygnus.com>
 
        * config/tc-ppc.c (md_parse_option): Support for -mcom to turn on

diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index bda925c8e2b57c8c515dde3d9d830e60dbcd8e8b..4e588534737f6f035f9555adaa86fa5eed3e231c 100644 (file)
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -755,14 +755,13 @@ md_begin ()
                 601 and a different value on other PowerPC
                 processors.  It's easier to permit a duplication than
                 to define a new instruction type flag.  When using
-                -many, the comparison instructions are a harmless
+                -many/-mcom, the comparison instructions are a harmless
                 special case.  */
              if (strcmp (retval, "exists") != 0
                  || (((ppc_cpu & PPC_OPCODE_601) == 0
                       || strcmp (op->name, "mfdec") != 0)
-                     && (ppc_cpu != (PPC_OPCODE_POWER
-                                     | PPC_OPCODE_POWER2
-                                     | PPC_OPCODE_PPC)
+                     && (((ppc_cpu & ~PPC_OPCODE_POWER2)
+                         == (PPC_OPCODE_POWER | PPC_OPCODE_PPC))
                          || (strcmp (op->name, "cmpli") != 0
                              && strcmp (op->name, "cmpi") != 0
                              && strcmp (op->name, "cmp") != 0