aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorUros Bizjak <ubizjak@gmail.com>2012-03-02 19:41:21 +0100
committerUros Bizjak <uros@gcc.gnu.org>2012-03-02 19:41:21 +0100
commit76945a7ca873ae605c0a7d136d35d118c1d73067 (patch)
tree03ded9057cc05974040a9a379e6d3a5b3aff5893 /gcc
parent2ff1689326c4f007bf2a388460d3a1aff72a769c (diff)
downloadgcc-76945a7ca873ae605c0a7d136d35d118c1d73067.zip
gcc-76945a7ca873ae605c0a7d136d35d118c1d73067.tar.gz
gcc-76945a7ca873ae605c0a7d136d35d118c1d73067.tar.bz2
i386.c (ix86_cc_modes_compatible): Declare CCZmode compatible with CCGOCmode and CCGCmode.
* config/i386/i386.c (ix86_cc_modes_compatible): Declare CCZmode compatible with CCGOCmode and CCGCmode. From-SVN: r184813
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/i386/i386.c5
-rw-r--r--gcc/testsuite/ChangeLog2
3 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 677a90b..284fd07 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-02 Uros Bizjak <ubizjak@gmail.com>
+
+ * config/i386/i386.c (ix86_cc_modes_compatible): Declare CCZmode
+ compatible with CCGOCmode and CCGCmode.
+
2012-03-02 Peter Bergner <bergner@vnet.ibm.com>
* config/rs6000/vsx.md (vsx_set_<mode>): Reorder operands.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 65c4c42..d68131a 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -17827,6 +17827,11 @@ ix86_cc_modes_compatible (enum machine_mode m1, enum machine_mode m2)
|| (m1 == CCGOCmode && m2 == CCGCmode))
return CCGCmode;
+ if (m1 == CCZmode && (m2 == CCGCmode || m2 == CCGOCmode))
+ return m2;
+ else if (m2 == CCZmode && (m1 == CCGCmode || m1 == CCGOCmode))
+ return m1;
+
switch (m1)
{
default:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 27872a3..4e11259 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -9,7 +9,7 @@
2012-03-02 Uros Bizjak <ubizjak@gmail.com>
PR target/46716
- * gcc.target/i386/pr46176.c: New test.
+ * gcc.target/i386/pr46716.c: New test.
2012-03-02 Paolo Carlini <paolo.carlini@oracle.com>