[gcc(refs/vendors/ibm/heads/gcc-17-future)] Fix merge errors.
Michael Meissner via Gcc-cvs <[email protected]>
| Newsgroups | gmane.comp.gcc.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://gcc.gnu.org/g:3624abe10827539be19941da1a29c799590eff49 commit 3624abe10827539be19941da1a29c799590eff49 Author: Michael Meissner <[email protected]> Date: Wed Jul 15 12:42:32 2026 -0400 Fix merge errors. Diff: --- gcc/config/rs6000/rs6000-cpus.def | 2 +- gcc/config/rs6000/rs6000.cc | 10 +++++----- gcc/config/rs6000/rs6000.opt | 4 ---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/gcc/config/rs6000/rs6000-cpus.def b/gcc/config/rs6000/rs6000-cpus.def index 331501179099..8d6e1d1e71ab 100644 --- a/gcc/config/rs6000/rs6000-cpus.def +++ b/gcc/config/rs6000/rs6000-cpus.def @@ -146,7 +146,7 @@ | OPTION_MASK_POWER10 \ | OPTION_MASK_POWER11 \ | OPTION_MASK_FUTURE \ - | OPTION_MASK_DMF \ + | OPTION_MASK_DENSE_MATH \ | OPTION_MASK_P10_FUSION \ | OPTION_MASK_HTM \ | OPTION_MASK_ISEL \ diff --git a/gcc/config/rs6000/rs6000.cc b/gcc/config/rs6000/rs6000.cc index a5a51d569066..aff273ee8237 100644 --- a/gcc/config/rs6000/rs6000.cc +++ b/gcc/config/rs6000/rs6000.cc @@ -4554,16 +4554,16 @@ rs6000_option_override_internal (bool global_init_p) } /* Enable -mdense_math by default on future systems. */ - if (TARGET_FUTURE && (rs6000_isa_flags_explicit & OPTION_MASK_DMF) == 0) - rs6000_isa_flags |= OPTION_MASK_DMF; + if (TARGET_FUTURE && (rs6000_isa_flags_explicit & OPTION_MASK_DENSE_MATH) == 0) + rs6000_isa_flags |= OPTION_MASK_DENSE_MATH; /* Turn off DMF options on non-future systems. */ else if (!TARGET_FUTURE && TARGET_DENSE_MATH) { - if ((rs6000_isa_flags_explicit & OPTION_MASK_DMF) != 0) + if ((rs6000_isa_flags_explicit & OPTION_MASK_DENSE_MATH) != 0) error ("%qs requires %qs", "-mdense_math", "-mcpu=future"); - rs6000_isa_flags &= ~OPTION_MASK_DMF; + rs6000_isa_flags &= ~OPTION_MASK_DENSE_MATH; } /* Enable power10 fusion if we are tuning for power10, even if we aren't @@ -24914,7 +24914,7 @@ static struct rs6000_opt_mask const rs6000_opt_masks[] = { "power10", OPTION_MASK_POWER10, false, true }, { "power11", OPTION_MASK_POWER11, false, false }, { "future", OPTION_MASK_FUTURE, false, false }, - { "dense-math", OPTION_MASK_DMF, false, true }, + { "dense-math", OPTION_MASK_DENSE_MATH, false, true }, { "hard-dfp", OPTION_MASK_DFP, false, true }, { "htm", OPTION_MASK_HTM, false, true }, { "float16", OPTION_MASK_FLOAT16, false, true }, diff --git a/gcc/config/rs6000/rs6000.opt b/gcc/config/rs6000/rs6000.opt index 9f6ad0a4792c..c37decc8c7f0 100644 --- a/gcc/config/rs6000/rs6000.opt +++ b/gcc/config/rs6000/rs6000.opt @@ -599,10 +599,6 @@ Target Undocumented Mask(POWER11) Var(rs6000_isa_flags) WarnRemoved mfuture Target Undocumented Mask(FUTURE) Var(rs6000_isa_flags) Warn(Do not use %<-mfuture>, use %<-mcpu=future>) -mdense-math -Target Mask(DMF) Var(rs6000_isa_flags) -Generate (do not generate) DMF (Dense Math Facility) instructions. - mprefixed Target Mask(PREFIXED) Var(rs6000_isa_flags) Generate (do not generate) prefixed memory instructions.