Bug 413771: Dialect category and options for language standards for LLVM toolchains

2 files changed, 50 insertions, 36 deletions

diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.properties b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.properties
index b43f9f90ef3..9ee465b8318 100755
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.properties
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.properties
@@ -58,6 +58,8 @@ PlatformName.Dbg=Debug Platform
 ToolName.archiver.llvm=LLVM archiver

 ToolName.assembler.llvm=LLVM assembler

 ToolName.compiler.llvm.abstract=Abstract LLVM C/C++ compiler

+ToolName.compiler.llvm.c.abstract=Abstract LLVM C compiler

+ToolName.compiler.llvm.cpp.abstract=Abstract LLVM C++ compiler

 ToolName.compiler.llvm.c=LLVM Clang

 ToolName.compiler.llvm.cpp=LLVM Clang++

 ToolName.compiler.llvm.gcc=LLVM GCC

@@ -74,6 +76,7 @@ ToolName.lli.llvm=LLVM JIT compiler/Interpreter
 # Option Names

 # Generic Category Names

 #OptionCategory.Symbols = Symbols

+OptionCategory.Dialect = Dialect

 OptionCategory.Preproc=Preprocessor

 OptionCategory.Dirs=Directories

 OptionCategory.General=General

diff --git a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
index 65a8e6263da..661fd358bb1 100755
--- a/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
+++ b/llvm/org.eclipse.cdt.managedbuilder.llvm.ui/plugin.xml
@@ -709,6 +709,11 @@
                variableList="CPATH">

          </envVarBuildPath>

          <optionCategory

+               id="cdt.managedbuild.tool.llvm.c_cpp.category.dialect"

+               name="%OptionCategory.Dialect"

+               owner="cdt.managedbuild.tool.llvm.c_cpp.compiler">

+         </optionCategory>

+         <optionCategory

                id="llvm.c_cpp.compiler.category.preprocessor"

                name="%OptionCategory.Preproc"

                owner="cdt.managedbuild.tool.llvm.c_cpp.compiler">

@@ -951,10 +956,9 @@
          </outputType>

       </tool>

       <tool

-            command="clang"

-            id="cdt.managedbuild.tool.llvm.c.compiler"

+            id="cdt.managedbuild.tool.llvm.c.abstract.compiler"

             isAbstract="true"

-            name="%ToolName.compiler.llvm.c"

+            name="%ToolName.compiler.llvm.c.abstract"

             natureFilter="cnature"

             superClass="cdt.managedbuild.tool.llvm.c_cpp.compiler">

          <envVarBuildPath

@@ -962,6 +966,16 @@
                pathType="buildpathInclude"

                variableList="CPATH,C_INCLUDE_PATH">

          </envVarBuildPath>

+         <option

+               category="cdt.managedbuild.tool.llvm.c_cpp.category.dialect"

+               id="cdt.managedbuild.tool.llvm.c.compiler.option.dialect.std"

+               superClass="gnu.c.compiler.option.dialect.std">

+         </option>

+         <option

+               category="cdt.managedbuild.tool.llvm.c_cpp.category.dialect"

+               id="cdt.managedbuild.tool.llvm.c.compiler.option.dialect.flags"

+               superClass="gnu.c.compiler.option.dialect.flags">

+         </option>

          <inputType

                dependencyCalculator="org.eclipse.cdt.managedbuilder.llvm.makegen.LlvmDependencyCalculator2"

                dependencyContentType="org.eclipse.cdt.core.cHeader"

@@ -973,10 +987,9 @@
          </inputType>

       </tool>

       <tool

-            command="clang++"

-            id="cdt.managedbuild.tool.llvm.cpp.compiler"

+            id="cdt.managedbuild.tool.llvm.cpp.abstract.compiler"

             isAbstract="true"

-            name="%ToolName.compiler.llvm.cpp"

+            name="%ToolName.compiler.llvm.cpp.abstract"

             natureFilter="ccnature"

             superClass="cdt.managedbuild.tool.llvm.c_cpp.compiler">

          <envVarBuildPath

@@ -984,6 +997,16 @@
                pathType="buildpathInclude"

                variableList="CPATH,CPLUS_INCLUDE_PATH">

          </envVarBuildPath>

+         <option

+               category="cdt.managedbuild.tool.llvm.c_cpp.category.dialect"

+               id="cdt.managedbuild.tool.llvm.cpp.compiler.option.dialect.std"

+               superClass="gnu.cpp.compiler.option.dialect.std">

+         </option>

+         <option

+               category="cdt.managedbuild.tool.llvm.c_cpp.category.dialect"

+               id="cdt.managedbuild.tool.llvm.cpp.compiler.option.dialect.flags"

+               superClass="gnu.cpp.compiler.option.dialect.flags">

+         </option>

          <inputType

                dependencyCalculator="org.eclipse.cdt.managedbuilder.llvm.makegen.LlvmDependencyCalculator2"

                dependencyContentType="org.eclipse.cdt.core.cxxHeader"

@@ -995,26 +1018,28 @@
          </inputType>

       </tool>

       <tool

+            command="clang"

+            id="cdt.managedbuild.tool.llvm.c.compiler"

+            isAbstract="true"

+            name="%ToolName.compiler.llvm.c"

+            natureFilter="cnature"

+            superClass="cdt.managedbuild.tool.llvm.c.abstract.compiler">

+      </tool>

+      <tool

+            command="clang++"

+            id="cdt.managedbuild.tool.llvm.cpp.compiler"

+            name="%ToolName.compiler.llvm.cpp"

+            isAbstract="true"

+            natureFilter="ccnature"

+            superClass="cdt.managedbuild.tool.llvm.cpp.abstract.compiler">

+      </tool>

+      <tool

             command="llvm-gcc"

             id="cdt.managedbuild.tool.llvm.gcc.compiler"

             isAbstract="true"

             name="%ToolName.compiler.llvm.gcc"

             natureFilter="cnature"

-            superClass="cdt.managedbuild.tool.llvm.c_cpp.compiler">

-         <envVarBuildPath

-               buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver"

-               pathType="buildpathInclude"

-               variableList="CPATH,C_INCLUDE_PATH">

-         </envVarBuildPath>

-         <inputType

-               dependencyCalculator="org.eclipse.cdt.managedbuilder.llvm.makegen.LlvmDependencyCalculator2"

-               dependencyContentType="org.eclipse.cdt.core.cHeader"

-               dependencyExtensions="h"

-               id="cdt.managedbuild.tool.llvm.gcc.compiler.input"

-               languageId="org.eclipse.cdt.core.gcc"

-               sourceContentType="org.eclipse.cdt.core.cSource"

-               sources="c">

-         </inputType>

+            superClass="cdt.managedbuild.tool.llvm.c.abstract.compiler">

       </tool>

       <tool

             command="llvm-g++"

@@ -1022,21 +1047,7 @@
             isAbstract="true"

             name="%ToolName.compiler.llvm.g++"

             natureFilter="ccnature"

-            superClass="cdt.managedbuild.tool.llvm.c_cpp.compiler">

-         <envVarBuildPath

-               buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver"

-               pathType="buildpathInclude"

-               variableList="CPATH,CPLUS_INCLUDE_PATH">

-         </envVarBuildPath>

-         <inputType

-               dependencyCalculator="org.eclipse.cdt.managedbuilder.llvm.makegen.LlvmDependencyCalculator2"

-               dependencyContentType="org.eclipse.cdt.core.cxxHeader"

-               dependencyExtensions="h,H,hpp"

-               id="cdt.managedbuild.tool.llvm.g++.compiler.input"

-               languageId="org.eclipse.cdt.core.g++"

-               sourceContentType="org.eclipse.cdt.core.cxxSource"

-               sources="c,C,cc,cxx,cpp">

-         </inputType>

+            superClass="cdt.managedbuild.tool.llvm.cpp.abstract.compiler">

       </tool>

       <tool

             command="clang"