From: Martin Liska <mliska@suse.cz>
Date: Mon, 8 Mar 2021 11:56:06 +0000 (+0100)
Subject: i386: Properly set ix86_isa_flags
X-Git-Tag: basepoints/gcc-12~684
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb5e1998e29873ba77deff357dc27e8cef53dff0;p=thirdparty%2Fgcc.git

i386: Properly set ix86_isa_flags

gcc/ChangeLog:

	PR target/99464
	* config/i386/i386-options.c (ix86_option_override_internal):
	Set isa_flags for OPTS argument and not for the global
	global_options.

gcc/testsuite/ChangeLog:

	PR target/99464
	* gcc.target/i386/pr99464.c: New test.
---

diff --git a/gcc/config/i386/i386-options.c b/gcc/config/i386/i386-options.c
index 410fa0cc436c..e93935f6f2c3 100644
--- a/gcc/config/i386/i386-options.c
+++ b/gcc/config/i386/i386-options.c
@@ -2159,11 +2159,11 @@ ix86_option_override_internal (bool main_args_p,
 	    && !(opts->x_ix86_isa_flags2_explicit & OPTION_MASK_ISA2_MOVBE))
 	  opts->x_ix86_isa_flags2 |= OPTION_MASK_ISA2_MOVBE;
 	if (((processor_alias_table[i].flags & PTA_AES) != 0)
-	    && !(ix86_isa_flags_explicit & OPTION_MASK_ISA_AES))
-	  ix86_isa_flags |= OPTION_MASK_ISA_AES;
+	    && !(opts->x_ix86_isa_flags_explicit & OPTION_MASK_ISA_AES))
+	  opts->x_ix86_isa_flags |= OPTION_MASK_ISA_AES;
 	if (((processor_alias_table[i].flags & PTA_SHA) != 0)
-	    && !(ix86_isa_flags_explicit & OPTION_MASK_ISA_SHA))
-	  ix86_isa_flags |= OPTION_MASK_ISA_SHA;
+	    && !(opts->x_ix86_isa_flags_explicit & OPTION_MASK_ISA_SHA))
+	  opts->x_ix86_isa_flags |= OPTION_MASK_ISA_SHA;
 	if (((processor_alias_table[i].flags & PTA_PCLMUL) != 0)
 	    && !(opts->x_ix86_isa_flags_explicit & OPTION_MASK_ISA_PCLMUL))
 	  opts->x_ix86_isa_flags |= OPTION_MASK_ISA_PCLMUL;
diff --git a/gcc/testsuite/gcc.target/i386/pr99464.c b/gcc/testsuite/gcc.target/i386/pr99464.c
new file mode 100644
index 000000000000..98dd938973ee
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr99464.c
@@ -0,0 +1,15 @@
+/* PR target/99464 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+#pragma GCC target("arch=cannonlake")
+
+#include <immintrin.h>
+
+volatile __m128i x;
+
+void extern
+sha_test (void)
+{
+  x = _mm_sha1msg1_epu32 (x, x);
+}