re PR target/58158 (ICE with conditional moves on GPRs with a floating point conditio...

2015-03-02  Steve Ellcey  <sellcey@imgtec.com>

	PR target/58158
	* config/mips/mips.md (mov<mode>cc): Change ISA_HAS_SEL check to
	!ISA_HAS_FP_CONDMOVE.

From-SVN: r221128

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index acfb16c525e2ce4ec0066a40451f37d2dbb3108e..09ebb7ea35fb5c68deda2a5df8359d5ee89e3556 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-02  Steve Ellcey  <sellcey@imgtec.com>
+
+       PR target/58158
+       * config/mips/mips.md (mov<mode>cc): Change ISA_HAS_SEL check to
+       !ISA_HAS_FP_CONDMOVE.
+
 2015-03-02  Aldy Hernandez  <aldyh@redhat.com>
 
        * config/i386/i386.md (*udivmod<mode>4_pow2): Remove

diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md
index 2fb278650ca946a465a048e0885d70a45d728318..3672c0bded0397415bd8d80d8b4e8057ce1c7205 100644 (file)
--- a/gcc/config/mips/mips.md
+++ b/gcc/config/mips/mips.md
@@ -7150,7 +7150,8 @@
                          (match_operand:GPR 3 "reg_or_0_operand")))]
   "ISA_HAS_CONDMOVE || ISA_HAS_SEL"
 {
-  if (ISA_HAS_SEL && !INTEGRAL_MODE_P (GET_MODE (XEXP (operands[1], 0))))
+  if (!ISA_HAS_FP_CONDMOVE
+      && !INTEGRAL_MODE_P (GET_MODE (XEXP (operands[1], 0))))
     FAIL;
 
   mips_expand_conditional_move (operands);