From: Uros Bizjak <ubizjak@gmail.com>
Date: Sun, 14 May 2017 18:00:48 +0000 (+0200)
Subject: i386.i386.c (ix86_cc_modes_compatible): CCNOmode is compatible with CCGOCmode and... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9430f7b8e71286b54153227e5fdaf42ab8e955dc;p=gcc.git

i386.i386.c (ix86_cc_modes_compatible): CCNOmode is compatible with CCGOCmode and with CCZmode.

	* config/i386.i386.c (ix86_cc_modes_compatible): CCNOmode is
	compatible with CCGOCmode and with CCZmode.

From-SVN: r248036
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4f20bcef11e..9a210428206 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-05-14  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386.i386.c (ix86_cc_modes_compatible): CCNOmode is
+	compatible with CCGOCmode and with CCZmode.
+
 2017-05-14  Martin Sebor  <msebor@redhat.com>
 
 	PR middle-end/77671
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 4676e7ff49a..a78819d6b3f 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -23251,9 +23251,15 @@ ix86_cc_modes_compatible (machine_mode m1, machine_mode m2)
       || (m1 == CCGOCmode && m2 == CCGCmode))
     return CCGCmode;
 
-  if (m1 == CCZmode && (m2 == CCGCmode || m2 == CCGOCmode))
+  if ((m1 == CCNOmode && m2 == CCGOCmode)
+      || (m1 == CCGOCmode && m2 == CCNOmode))
+    return CCNOmode;
+
+  if (m1 == CCZmode
+      && (m2 == CCGCmode || m2 == CCGOCmode || m2 == CCNOmode))
     return m2;
-  else if (m2 == CCZmode && (m1 == CCGCmode || m1 == CCGOCmode))
+  else if (m2 == CCZmode
+	   && (m1 == CCGCmode || m1 == CCGOCmode || m1 == CCNOmode))
     return m1;
 
   switch (m1)