Re: [PATCH] c++: Rename -fmodules-ts to -fmodules in diagnostics

[Jason Merrill]

On 4/1/25 7:49 AM, Nathaniel Shead wrote:

Tested on x86_64-pc-linux-gnu, OK for trunk if full bootstrap + regtest
succeeds?

OK.

-- >8 --

This replaces some usages of the old -fmodules-ts flag with the new
-fmodules flag made in r15-5112-gd9c3c3c85665b2.

gcc/cp/ChangeLog:

        * parser.cc (cp_parser_diagnose_invalid_type_name): Replace
        fmodules-ts with fmodules.
        (cp_parser_template_declaration): Likewise.

Signed-off-by: Nathaniel Shead <nathanielosh...@gmail.com>
---
  gcc/cp/parser.cc | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc
index 88e722d8406..f2eea4c70fd 100644
--- a/gcc/cp/parser.cc
+++ b/gcc/cp/parser.cc
@@ -3901,10 +3901,10 @@ cp_parser_diagnose_invalid_type_name (cp_parser 
*parser, tree id,
            inform (location, "%qE is not recognized as a module control-line",
                    id);
          else if (cxx_dialect < cxx20)
-           inform (location, "C++20 %qE only available with %<-fmodules-ts%>",
+           inform (location, "C++20 %qE only available with %<-fmodules%>",
                    id);
          else
-           inform (location, "C++20 %qE only available with %<-fmodules-ts%>"
+           inform (location, "C++20 %qE only available with %<-fmodules%>"
                    ", which is not yet enabled with %<-std=c++20%>", id);
        }
        else if (cxx_dialect < cxx11
@@ -18845,7 +18845,7 @@ cp_parser_template_declaration (cp_parser* parser, bool 
member_p)
        else if (cxx_dialect < cxx20)
        warning (0, "keyword %<export%> is deprecated, and is ignored");
        else
-       warning (0, "keyword %<export%> is enabled with %<-fmodules-ts%>");
+       warning (0, "keyword %<export%> is enabled with %<-fmodules%>");
      }

cp_parser_template_declaration_after_export (parser, member_p);