From abf47ce68918e6be55c24f507872a992bc971346 Mon Sep 17 00:00:00 2001
From: John Dallaway <john@dallaway.org.uk>
Date: Sun, 29 Dec 2024 11:17:29 +0000
Subject: [PATCH] Extend GNU toolchain language standard options for MBS

---
 .../plugin.properties                         |  7 ++++++-
 .../plugin.xml                                | 19 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
index 4883c0cf501..7a12df92941 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
@@ -13,6 +13,7 @@
 #     IBM Corporation
 #     John Dallaway - add library grouping option (#608)
 #     John Dallaway - extend optimization options (#828)
+#     John Dallaway - extend language standard options (#944)
 ###############################################################################
 
 # plugin names
@@ -121,11 +122,15 @@ Option.Posix.Dialect.default=
 Option.Posix.Dialect.c90=ISO C90 / ANSI C89 (-std=c90)
 Option.Posix.Dialect.c99=ISO C99 (-std=c99)
 Option.Posix.Dialect.c11=ISO C11 (-std=c11)
+Option.Posix.Dialect.c17=ISO C17 (-std=c17)
+Option.Posix.Dialect.c23=ISO C23 (-std=c23)
 Option.Posix.Dialect.c++98=ISO C++98 (-std=c++98)
 Option.Posix.Dialect.c++11=ISO C++11 (-std=c++11)
 Option.Posix.Dialect.c++14=ISO C++14 (-std=c++14)
 Option.Posix.Dialect.c++17=ISO C++17 (-std=c++17)
-Option.Posix.Dialect.c++2a=ISO C++20 (-std=c++2a)
+Option.Posix.Dialect.c++2a=ISO C++20 (-std=c++20)
+Option.Posix.Dialect.c++23=ISO C++23 (-std=c++23)
+Option.Posix.Dialect.c++26=ISO C++26 (-std=c++26)
 Option.Posix.Dialect.Flags=Other dialect flags
 
 Option.Posix.PreprocOnly=Preprocess only (-E)
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index f952e17d891..f8bcf8c12d8 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -14,6 +14,7 @@ Contributors:
     John Dallaway - add assembler debug level option (#727)
     John Dallaway - extend optimization options (#828)
     John Dallaway - add archiver other objects option (#653)
+    John Dallaway - extend language standard options (#944)
 -->
 <plugin>
    <!-- Managed Make Builder Tool Specifications -->
@@ -969,6 +970,14 @@ Contributors:
                   name="%Option.Posix.Dialect.c11"
                   command="-std=c11"
                   id="gnu.c.compiler.dialect.c11" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c17"
+                  command="-std=c17"
+                  id="gnu.c.compiler.dialect.c17" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c23"
+                  command="-std=c23"
+                  id="gnu.c.compiler.dialect.c23" />
          </option>
          <option
                name="%Option.Posix.Dialect.Flags"
@@ -1462,8 +1471,16 @@ Contributors:
                   id="gnu.cpp.compiler.dialect.c++17" />
             <enumeratedOptionValue
                   name="%Option.Posix.Dialect.c++2a"
-                  command="-std=c++2a"
+                  command="-std=c++20"
                   id="gnu.cpp.compiler.dialect.c++2a" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c++23"
+                  command="-std=c++23"
+                  id="gnu.cpp.compiler.dialect.c++23" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c++26"
+                  command="-std=c++26"
+                  id="gnu.cpp.compiler.dialect.c++26" />
          </option>
          <option
                name="%Option.Posix.Dialect.Flags"