[gcc(refs/users/meissner/heads/work055)] Rework prefixed constant option setting.

[gcc(refs/users/meissner/heads/work055)] Rework prefixed constant option setting.

[Michael Meissner]

https://gcc.gnu.org/g:822a1ae821b9e3374804e674815c244d54fc8be2

commit 822a1ae821b9e3374804e674815c244d54fc8be2
Author: Michael Meissner <meissner@linux.ibm.com>
Date:   Wed Jun 16 16:12:04 2021 -0400

    Rework prefixed constant option setting.
    
    gcc/
    2021-06-16  Michael Meissner  <meissner@linux.ibm.com>
    
            * config/rs6000/rs6000.c (rs6000_option_override_internal):
            Rework requiring -mprefixed for -mpower10-large-consts,
            -mxxspltiw, -mxxspltidp, and -mxxsplti32dx.

Diff:
---
 gcc/config/rs6000/rs6000.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index a5555045c1c..1e94ed7e438 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4489,12 +4489,6 @@ rs6000_option_override_internal (bool global_init_p)
       && (rs6000_isa_flags_explicit & OPTION_MASK_P10_FUSION_2ADD) == 0)
     rs6000_isa_flags |= OPTION_MASK_P10_FUSION_2ADD;
 
-  if (TARGET_PREFIXED
-      && (rs6000_isa_flags_explicit & OPTION_MASK_P10_LARGE_CONSTS) == 0)
-    rs6000_isa_flags |= OPTION_MASK_P10_LARGE_CONSTS;
-  else if (!TARGET_PREFIXED)
-    rs6000_isa_flags &= ~OPTION_MASK_P10_LARGE_CONSTS;
-
   /* Turn off vector pair/mma options on non-power10 systems.  */
   else if (!TARGET_POWER10 && TARGET_MMA)
     {
@@ -4507,8 +4501,11 @@ rs6000_option_override_internal (bool global_init_p)
   if (!TARGET_PCREL && TARGET_PCREL_OPT)
     rs6000_isa_flags &= ~OPTION_MASK_PCREL_OPT;
 
-  if (TARGET_POWER10 && TARGET_VSX)
+  if (TARGET_POWER10 && TARGET_VSX && TARGET_PREFIXED)
     {
+      if ((rs6000_isa_flags_explicit & OPTION_MASK_P10_LARGE_CONSTS) == 0)
+	rs6000_isa_flags |= OPTION_MASK_P10_LARGE_CONSTS;
+
       if ((rs6000_isa_flags_explicit & OPTION_MASK_XXSPLTI32DX) == 0)
 	rs6000_isa_flags |= OPTION_MASK_XXSPLTI32DX;
 
@@ -4519,7 +4516,8 @@ rs6000_option_override_internal (bool global_init_p)
 	rs6000_isa_flags |= OPTION_MASK_XXSPLTIDP;
     }
   else
-    rs6000_isa_flags &= ~(OPTION_MASK_XXSPLTIW
+    rs6000_isa_flags &= ~(OPTION_MASK_P10_LARGE_CONSTS
+			  | OPTION_MASK_XXSPLTIW
 			  | OPTION_MASK_XXSPLTIDP
 			  | OPTION_MASK_XXSPLTI32DX);