Fix bootstrap failure.

gcc/
	* config/i386/i386.c (ix86_expand_sse2_mulvxdi3): Refactor
	conditions to fix bootstrap.

From-SVN: r216403

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b92567627b149dd6209a5e3f8d9d870e1a019cc4..f0b1c4a4d251d5d5e24c54b2c1fb5481a8d78de7 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-17  Kirill Yukhin  <kirill.yukhin@intel.com>
+
+       * config/i386/i386.c (ix86_expand_sse2_mulvxdi3): Refactor
+       conditions to fix bootstrap.
+
 2014-10-17  Andrew MacLeod  <amacleod@redhat.com>
 
        gcc-plugin.h:  Add tm.h and flattened includes from function.h.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 7040200b2653db769a171db6dd917c8e9be1910e..3ddaf3de5fe5549e0f41f36197774292fc90602c 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -45671,21 +45671,12 @@ ix86_expand_sse2_mulvxdi3 (rtx op0, rtx op1, rtx op2)
   enum machine_mode mode = GET_MODE (op0);
   rtx t1, t2, t3, t4, t5, t6;
 
-  if (TARGET_AVX512DQ)
-    {
-      rtx (*gen) (rtx, rtx, rtx);
-
-      if (mode == V8DImode)
-       gen = gen_avx512dq_mulv8di3;
-      else if (TARGET_AVX512VL)
-       {
-         if (mode == V4DImode)
-           gen = gen_avx512dq_mulv4di3;
-         else if (mode == V2DImode)
-           gen = gen_avx512dq_mulv2di3;
-       }
-      emit_insn (gen (op0, op1, op2));
-    }
+  if (TARGET_AVX512DQ && mode == V8DImode)
+    emit_insn (gen_avx512dq_mulv8di3 (op0, op1, op2));
+  else if (TARGET_AVX512DQ && TARGET_AVX512VL && mode == V4DImode)
+    emit_insn (gen_avx512dq_mulv4di3 (op0, op1, op2));
+  else if (TARGET_AVX512DQ && TARGET_AVX512VL && mode == V2DImode)
+    emit_insn (gen_avx512dq_mulv2di3 (op0, op1, op2));
   else if (TARGET_XOP && mode == V2DImode)
     {
       /* op1: A,B,C,D, op2: E,F,G,H */