[PATCH][v2] target/119549 - fixup handling of -mno-sse4 in target attribute

[Richard Biener]

The following fixes ix86_valid_target_attribute_inner_p to properly
handle target("no-sse4") via OPT_mno_sse4 rather than as unset OPT_msse4.
I've added asserts to ix86_handle_option that RejectNegative is honored
for both.

Bootstrapped and tested on x86_64-unknown-linux-gnu.

OK?

Thanks,
Richard.

        PR target/119549
        * common/config/i386/i386-common.cc (ix86_handle_option):
        Assert that both OPT_msse4 and OPT_mno_sse4 are never unset.
        * config/i386/i386-options.cc (ix86_valid_target_attribute_inner_p):
        Process negated OPT_msse4 as OPT_mno_sse4.

        * gcc.target/i386/pr119549.c: New testcase.
---
 gcc/common/config/i386/i386-common.cc    |  2 ++
 gcc/config/i386/i386-options.cc          |  7 +++++++
 gcc/testsuite/gcc.target/i386/pr119549.c | 15 +++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/i386/pr119549.c

diff --git a/gcc/common/config/i386/i386-common.cc 
b/gcc/common/config/i386/i386-common.cc
index 80aec3244bc..4815fbc4d35 100644
--- a/gcc/common/config/i386/i386-common.cc
+++ b/gcc/common/config/i386/i386-common.cc
@@ -1519,11 +1519,13 @@ ix86_handle_option (struct gcc_options *opts,
       return true;
 
     case OPT_msse4:
+      gcc_assert (value != 0);
       opts->x_ix86_isa_flags |= OPTION_MASK_ISA_SSE4_SET;
       opts->x_ix86_isa_flags_explicit |= OPTION_MASK_ISA_SSE4_SET;
       return true;
 
     case OPT_mno_sse4:
+      gcc_assert (value != 0);
       opts->x_ix86_isa_flags &= ~OPTION_MASK_ISA_SSE4_UNSET;
       opts->x_ix86_isa_flags_explicit |= OPTION_MASK_ISA_SSE4_UNSET;
       opts->x_ix86_isa_flags2 &= ~OPTION_MASK_ISA2_SSE4_UNSET;
diff --git a/gcc/config/i386/i386-options.cc b/gcc/config/i386/i386-options.cc
index 91f59e16fd5..a9fac011f3d 100644
--- a/gcc/config/i386/i386-options.cc
+++ b/gcc/config/i386/i386-options.cc
@@ -1271,6 +1271,13 @@ ix86_valid_target_attribute_inner_p (tree fndecl, tree 
args, char *p_strings[],
            }
        }
 
+      /* Fixup -msse4 which is RejectNegative to -mno-sse4 when negated.  */
+      if (opt == OPT_msse4 && !opt_set_p)
+       {
+         opt = OPT_mno_sse4;
+         opt_set_p = true;
+       }
+
       /* Process the option.  */
       if (opt == N_OPTS)
        {
diff --git a/gcc/testsuite/gcc.target/i386/pr119549.c 
b/gcc/testsuite/gcc.target/i386/pr119549.c
new file mode 100644
index 00000000000..a465bec3cf0
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr119549.c
@@ -0,0 +1,15 @@
+/* { dg-do compile } */
+/* { dg-options "-msse4" } */
+
+typedef long long v2di __attribute__((vector_size(16)));
+
+static inline __attribute__((always_inline))
+int rte_trace_feature_is_enabled() { return 1; } /* { dg-error "inlining 
failed" } */
+
+void __attribute__((target ("no-sse3"))) __attribute__((target ("no-sse4")))
+rte_eal_trace_generic_void_init(void)
+{
+  if (!rte_trace_feature_is_enabled()) return;
+  __asm__ volatile ("" : : : "memory");
+}
+
-- 
2.43.0