bug 404913: Dialect category and options for language standards for GCC toolchain

2 files changed, 91 insertions, 0 deletions

diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
index ea1c1abd6ae..d9688353747 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
@@ -99,6 +99,7 @@ ToolName.compiler.solaris.cpp = Solaris C++ Compiler
 
 # Generic Category Names
 OptionCategory.Symbols = Symbols
+OptionCategory.Dialect = Dialect
 OptionCategory.Preproc = Preprocessor
 OptionCategory.Dirs = Includes
 OptionCategory.General = General
@@ -110,6 +111,16 @@ OptionCategory.Libs=Libraries
 OptionCategory.Shared.Settings=Shared Library Settings
 
 # Generic Option Names
+Option.Posix.Dialect=Language standard
+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.c++98=ISO C++98 (-std=c++98)
+Option.Posix.Dialect.c++11=ISO C++11 (-std=c++0x)
+Option.Posix.Dialect.c++1y=ISO C++1y (-std=c++1y)
+Option.Posix.Dialect.Flags=Other dialect flags
+
 Option.Posix.PreprocOnly=Preprocess only (-E)
 Option.Posix.Nostdinc=Do not search system directories (-nostdinc)
 
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index eaa55a1ea6f..02808dff5f4 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -960,6 +960,46 @@
          	variableList="CPATH,C_INCLUDE_PATH">
          </envVarBuildPath>
 		  <optionCategory
+			  owner="cdt.managedbuild.tool.gnu.c.compiler"
+			  name="%OptionCategory.Dialect"
+			  id="gnu.c.compiler.category.dialect">
+		  </optionCategory>
+		  <option
+			  category="gnu.c.compiler.category.dialect"
+			  defaultValue="false"
+			  id="gnu.c.compiler.option.dialect.std"
+			  name="%Option.Posix.Dialect"
+			  useByScannerDiscovery="true"
+			  valueType="enumerated">
+			  <enumeratedOptionValue
+					  name="%Option.Posix.Dialect.default"
+					  command=""
+					  id="gnu.c.compiler.dialect.default">
+			  </enumeratedOptionValue>
+			  <enumeratedOptionValue
+					  name="%Option.Posix.Dialect.c90"
+					  command="-std=c90"
+					  id="gnu.c.compiler.dialect.c90">
+			  </enumeratedOptionValue>
+			  <enumeratedOptionValue
+					  name="%Option.Posix.Dialect.c99"
+					  command="-std=c99"
+					  id="gnu.c.compiler.dialect.c99">
+			  </enumeratedOptionValue>
+			  <enumeratedOptionValue
+					  name="%Option.Posix.Dialect.c11"
+					  command="-std=c11"
+					  id="gnu.c.compiler.dialect.c11">
+			  </enumeratedOptionValue>
+		  </option>
+		  <option
+			  name="%Option.Posix.Dialect.Flags"
+			  category="gnu.c.compiler.category.dialect"
+			  id="gnu.c.compiler.option.dialect.flags"
+			  useByScannerDiscovery="true"
+			  valueType="string">
+		  </option>
+		  <optionCategory
 		      owner="cdt.managedbuild.tool.gnu.c.compiler"
 			  name="%OptionCategory.Preproc"
 			  id="gnu.c.compiler.category.preprocessor">
@@ -1297,6 +1337,46 @@
          </envVarBuildPath>
 		  <optionCategory
 			  owner="cdt.managedbuild.tool.gnu.cpp.compiler"
+			  name="%OptionCategory.Dialect"
+			  id="gnu.cpp.compiler.category.dialect">
+		  </optionCategory>
+		  <option
+			  category="gnu.cpp.compiler.category.dialect"
+			  defaultValue="false"
+			  id="gnu.cpp.compiler.option.dialect.std"
+			  name="%Option.Posix.Dialect"
+			  useByScannerDiscovery="true"
+			  valueType="enumerated">
+			  <enumeratedOptionValue
+					  name="%Option.Posix.Dialect.default"
+					  command=""
+					  id="gnu.cpp.compiler.dialect.default">
+			  </enumeratedOptionValue>
+			  <enumeratedOptionValue
+					  name="%Option.Posix.Dialect.c++98"
+					  command="-std=c++98"
+					  id="gnu.cpp.compiler.dialect.c++98">
+			  </enumeratedOptionValue>
+			  <enumeratedOptionValue
+					  name="%Option.Posix.Dialect.c++11"
+					  command="-std=c++0x"
+					  id="gnu.cpp.compiler.dialect.c++11">
+			  </enumeratedOptionValue>
+			  <enumeratedOptionValue
+					  name="%Option.Posix.Dialect.c++1y"
+					  command="-std=c++1y"
+					  id="gnu.cpp.compiler.dialect.c++1y">
+			  </enumeratedOptionValue>
+		  </option>
+		  <option
+			  name="%Option.Posix.Dialect.Flags"
+			  category="gnu.cpp.compiler.category.dialect"
+			  id="gnu.cpp.compiler.option.dialect.flags"
+			  useByScannerDiscovery="true"
+			  valueType="string">
+		  </option>
+		  <optionCategory
+			  owner="cdt.managedbuild.tool.gnu.cpp.compiler"
 			  name="%OptionCategory.Preproc"
 			  id="gnu.cpp.compiler.category.preprocessor">
 		  </optionCategory>