Fix GFNI check which didn't work properly in gfni+sse case

gcc/
	PR target/82983
	* config/i386/gfniintrin.h: Add sse check.
	* config/i386/i386.c (ix86_expand_builtin): Fix gfni check.

From-SVN: r254797

gcc/ChangeLog

 2017-11-16  Julia Koval  <julia.koval@intel.com>
 
+	PR target/82983
+	* config/i386/gfniintrin.h: Add sse check.
+	* config/i386/i386.c (ix86_expand_builtin): Fix gfni check.
+
+2017-11-16  Julia Koval  <julia.koval@intel.com>
+
 	* common/config/i386/i386-common.c (OPTION_MASK_ISA_AVX512VBMI2_SET,
 	OPTION_MASK_ISA_AVX512VBMI2_UNSET): New.
 	(ix86_handle_option): Handle -mavx512vbmi2.

gcc/config/i386/gfniintrin.h

@@ -28,9 +28,9 @@
 #ifndef _GFNIINTRIN_H_INCLUDED
 #define _GFNIINTRIN_H_INCLUDED
 
-#ifndef __GFNI__
+#if !defined(__GFNI__) || !defined(__SSE__)
 #pragma GCC push_options
-#pragma GCC target("gfni")
+#pragma GCC target("gfni,sse")
 #define __DISABLE_GFNI__
 #endif /* __GFNI__ */
 

gcc/config/i386/i386.c

@@ -35191,6 +35191,8 @@ ix86_expand_builtin (tree exp, rtx target, rtx subtarget,
 	    & ix86_isa_flags))
       || ((ix86_builtins_isa[fcode].isa & OPTION_MASK_ISA_AVX512VL)
 	  && !(ix86_isa_flags & OPTION_MASK_ISA_AVX512VL))
+      || ((ix86_builtins_isa[fcode].isa & OPTION_MASK_ISA_GFNI)
+	  && !(ix86_isa_flags & OPTION_MASK_ISA_GFNI))
       || ((ix86_builtins_isa[fcode].isa & OPTION_MASK_ISA_MMX)
 	  && !(ix86_isa_flags & OPTION_MASK_ISA_MMX))
       || (ix86_builtins_isa[fcode].isa2