From cad7438c759d387e5b05ba52f8dd43c7550e90f5 Mon Sep 17 00:00:00 2001 From: Kirill Yukhin Date: Fri, 17 Oct 2014 14:32:26 +0000 Subject: [PATCH] Fix bootstrap failure. gcc/ * config/i386/i386.c (ix86_expand_sse2_mulvxdi3): Refactor conditions to fix bootstrap. From-SVN: r216403 --- gcc/ChangeLog | 5 +++++ gcc/config/i386/i386.c | 21 ++++++--------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b92567627b1..f0b1c4a4d25 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-10-17 Kirill Yukhin + + * config/i386/i386.c (ix86_expand_sse2_mulvxdi3): Refactor + conditions to fix bootstrap. + 2014-10-17 Andrew MacLeod 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 7040200b265..3ddaf3de5fe 100644 --- 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 */ -- 2.30.2