From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1005) id 20CA0385802E; Wed, 16 Jun 2021 20:12:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20CA0385802E Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Michael Meissner To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/meissner/heads/work055)] Rework prefixed constant option setting. X-Act-Checkin: gcc X-Git-Author: Michael Meissner X-Git-Refname: refs/users/meissner/heads/work055 X-Git-Oldrev: f9c8ad2a4f06252a1404859b48b2f92c5d6bdb6f X-Git-Newrev: 822a1ae821b9e3374804e674815c244d54fc8be2 Message-Id: <20210616201250.20CA0385802E@sourceware.org> Date: Wed, 16 Jun 2021 20:12:50 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jun 2021 20:12:50 -0000 https://gcc.gnu.org/g:822a1ae821b9e3374804e674815c244d54fc8be2 commit 822a1ae821b9e3374804e674815c244d54fc8be2 Author: Michael Meissner Date: Wed Jun 16 16:12:04 2021 -0400 Rework prefixed constant option setting. gcc/ 2021-06-16 Michael Meissner * 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);