diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 09da182e7df..58c66a9ef8c 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -14,16 +14,12 @@ Contributors:
     John Dallaway - add assembler debug level option (#727)
 -->
 <plugin>
-
-    
-<!-- Managed Make Builder Tool Specifications -->
+   <!-- Managed Make Builder Tool Specifications -->
    <extension
          id="cdt.managed.build.info"
          name="%extension.name"
          point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
-      <managedBuildRevision
-            fileVersion="4.0.0">
-      </managedBuildRevision>
+      <managedBuildRevision fileVersion="4.0.0" />
       <tool
             natureFilter="cnature"
             name="%ToolName.linker.gnu.c"
@@ -31,67 +27,59 @@ Contributors:
             command="gcc"
             id="cdt.managedbuild.tool.gnu.c.linker"
             errorParsers="org.eclipse.cdt.core.GLDErrorParser">
-            <supportedProperties>
+         <supportedProperties>
             <property id="org.eclipse.cdt.build.core.buildArtefactType">
-	            <value id="org.eclipse.cdt.build.core.buildArtefactType.exe"/>
-    	        <value id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
+               <value id="org.eclipse.cdt.build.core.buildArtefactType.exe" />
+               <value id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
             </property>
-            </supportedProperties>
-         <envVarBuildPath 
-         	pathType="buildpathLibrary"
-         	variableList="LIBRARY_PATH">
+         </supportedProperties>
+         <envVarBuildPath
+               pathType="buildpathLibrary"
+               variableList="LIBRARY_PATH">
          </envVarBuildPath>
-         
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.c.linker"
                name="%OptionCategory.General"
-               id="gnu.c.link.category.general">
-         </optionCategory>
+               id="gnu.c.link.category.general" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoStartFiles"
                category="gnu.c.link.category.general"
                command="-nostartfiles"
                id="gnu.c.link.option.nostart"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoDefLibs"
                category="gnu.c.link.category.general"
                command="-nodefaultlibs"
                id="gnu.c.link.option.nodeflibs"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoStdLibs"
                category="gnu.c.link.category.general"
                command="-nostdlib"
                id="gnu.c.link.option.nostdlibs"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.Strip"
                category="gnu.c.link.category.general"
                command="-s"
                id="gnu.c.link.option.strip"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.Static"
                category="gnu.c.link.category.general"
                command="-static"
                id="gnu.c.link.option.noshared"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.c.linker"
                name="%OptionCategory.Libs"
-               id="gnu.c.link.category.libs">
-         </optionCategory>
+               id="gnu.c.link.category.libs" />
          <option
                name="%Option.Posix.Libs"
                category="gnu.c.link.category.libs"
@@ -99,53 +87,45 @@ Contributors:
                commandGenerator="org.eclipse.cdt.managedbuilder.gnu.ui.GnuCLibrariesCommandGenerator"
                id="gnu.c.link.option.libs"
                browseType="none"
-               valueType="libs">
-         </option>
+               valueType="libs" />
          <option
                name="%Option.Posix.Libsearch"
                category="gnu.c.link.category.libs"
                command="-L"
                id="gnu.c.link.option.paths"
                browseType="directory"
-               valueType="libPaths">
-         </option>
+               valueType="libPaths" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.GroupLibs"
                category="gnu.c.link.category.libs"
                id="gnu.c.link.option.group"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.c.linker"
                name="%OptionCategory.Misc"
-               id="gnu.c.link.category.other">
-         </optionCategory>
+               id="gnu.c.link.category.other" />
          <option
                name="%Option.Posix.Linker.Flags"
                category="gnu.c.link.category.other"
                valueType="string"
-               id="gnu.c.link.option.ldflags">
-         </option>
+               id="gnu.c.link.option.ldflags" />
          <option
                name="%Option.Posix.Linker.XLinker"
                category="gnu.c.link.category.other"
                command="-Xlinker ${VALUE}"
                valueType="stringList"
-               id="gnu.c.link.option.other">
-         </option>
+               id="gnu.c.link.option.other" />
          <option
                name="%Option.Posix.UserObjs"
                category="gnu.c.link.category.other"
                browseType="file"
                valueType="userObjs"
-               id="gnu.c.link.option.userobjs">
-         </option>
+               id="gnu.c.link.option.userobjs" />
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.c.linker"
                name="%OptionCategory.Shared.Settings"
-               id="gnu.c.link.category.shared">
-         </optionCategory>
+               id="gnu.c.link.category.shared" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.Shared"
@@ -153,15 +133,15 @@ Contributors:
                command="-shared"
                id="gnu.c.link.option.shared"
                valueType="boolean">
-              <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="true"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="true"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+            </enablement>
          </option>
          <option
                name="%Option.Posix.Linker.SOName"
@@ -175,56 +155,50 @@ Contributors:
                category="gnu.c.link.category.shared"
                command="-Wl,--out-implib="
                id="gnu.c.link.option.implname"
-               valueType="string">
-         </option>
+               valueType="string" />
          <option
                name="%Option.Posix.Linker.Defname"
                category="gnu.c.link.category.shared"
                command="-Wl,--output-def="
                id="gnu.c.link.option.defname"
-               valueType="string">
-         </option>
+               valueType="string" />
          <inputType
-            sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
-            sources="o"
-			multipleOfType="true"
-            dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
-            buildVariable="OBJS"
-            id="cdt.managedbuild.tool.gnu.c.linker.input">
+               sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
+               sources="o"
+               multipleOfType="true"
+               dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
+               buildVariable="OBJS"
+               id="cdt.managedbuild.tool.gnu.c.linker.input">
             <additionalInput
-            	paths="$(USER_OBJS)"
-            	kind="additionalinputdependency">
-            </additionalInput>
+                  paths="$(USER_OBJS)"
+                  kind="additionalinputdependency" />
             <additionalInput
-            	paths="$(LIBS)"
-            	kind="additionalinput">
-            </additionalInput>
+                  paths="$(LIBS)"
+                  kind="additionalinput" />
          </inputType>
          <outputType
-			outputs=""
-            buildVariable="EXECUTABLES"
-            nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
-            id="cdt.managedbuild.tool.gnu.c.linker.output">
-             <enablement 
-              	type="ALL">
-			  	<checkOption 
-			  		optionId="gnu.c.link.option.shared"
-			  		value="false"/>
-			  </enablement>
+               outputs=""
+               buildVariable="EXECUTABLES"
+               nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
+               id="cdt.managedbuild.tool.gnu.c.linker.output">
+            <enablement type="ALL">
+               <checkOption
+                     optionId="gnu.c.link.option.shared"
+                     value="false" />
+            </enablement>
          </outputType>
          <outputType
-		    outputs="so"
-			outputPrefix="lib"
-            nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
-			buildVariable="LIBRARIES"
-			id="cdt.managedbuild.tool.gnu.c.linker.output.so">
-             <enablement 
-              	type="ALL">
-			  	<checkOption 
-			  		optionId="gnu.c.link.option.shared"
-			  		value="true"/>
-			  </enablement>
-		 </outputType>
+               outputs="so"
+               outputPrefix="lib"
+               nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
+               buildVariable="LIBRARIES"
+               id="cdt.managedbuild.tool.gnu.c.linker.output.so">
+            <enablement type="ALL">
+               <checkOption
+                     optionId="gnu.c.link.option.shared"
+                     value="true" />
+            </enablement>
+         </outputType>
          <option
                applicabilityCalculator="org.eclipse.cdt.managedbuilder.gnu.ui.ProfAppCalculator"
                command="-p"
@@ -239,16 +213,14 @@ Contributors:
                defaultValue="false"
                id="gnu.c.link.option.debugging.gprof"
                name="%Option.Posix.Debug.gprof"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
-			  applicabilityCalculator="org.eclipse.cdt.managedbuilder.gnu.ui.GcovAppCalculator"
-			  command="-ftest-coverage -fprofile-arcs"
-			  defaultValue="false"
-			  id="gnu.c.link.option.debugging.codecov"
-			  name="%Option.codecov"
-			  valueType="boolean">
-		  </option>
+               applicabilityCalculator="org.eclipse.cdt.managedbuilder.gnu.ui.GcovAppCalculator"
+               command="-ftest-coverage -fprofile-arcs"
+               defaultValue="false"
+               id="gnu.c.link.option.debugging.codecov"
+               name="%Option.codecov"
+               valueType="boolean" />
       </tool>
       <tool
             natureFilter="ccnature"
@@ -257,58 +229,52 @@ Contributors:
             command="g++"
             id="cdt.managedbuild.tool.gnu.cpp.linker"
             errorParsers="org.eclipse.cdt.core.GLDErrorParser">
-            <supportedProperties>
+         <supportedProperties>
             <property id="org.eclipse.cdt.build.core.buildArtefactType">
-	            <value id="org.eclipse.cdt.build.core.buildArtefactType.exe"/>
-    	        <value id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
+               <value id="org.eclipse.cdt.build.core.buildArtefactType.exe" />
+               <value id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
             </property>
-            </supportedProperties>
-         <envVarBuildPath 
-         	pathType="buildpathLibrary"
-         	variableList="LIBRARY_PATH">
+         </supportedProperties>
+         <envVarBuildPath
+               pathType="buildpathLibrary"
+               variableList="LIBRARY_PATH">
          </envVarBuildPath>
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.cpp.linker"
                name="%OptionCategory.General"
-               id="gnu.cpp.link.category.options">
-         </optionCategory>
+               id="gnu.cpp.link.category.options" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoStartFiles"
                category="gnu.cpp.link.category.options"
                command="-nostartfiles"
                id="gnu.cpp.link.option.nostart"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoDefLibs"
                category="gnu.cpp.link.category.options"
                command="-nodefaultlibs"
                id="gnu.cpp.link.option.nodeflibs"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoStdLibs"
                category="gnu.cpp.link.category.options"
                command="-nostdlib"
                id="gnu.cpp.link.option.nostdlibs"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.Strip"
                category="gnu.cpp.link.category.options"
                command="-s"
                id="gnu.cpp.link.option.strip"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.cpp.linker"
                name="%OptionCategory.Libs"
-               id="gnu.cpp.link.category.libs">
-         </optionCategory>
+               id="gnu.cpp.link.category.libs" />
          <option
                name="%Option.Posix.Libs"
                category="gnu.cpp.link.category.libs"
@@ -316,53 +282,45 @@ Contributors:
                commandGenerator="org.eclipse.cdt.managedbuilder.gnu.ui.GnuCppLibrariesCommandGenerator"
                id="gnu.cpp.link.option.libs"
                browseType="none"
-               valueType="libs">
-         </option>
+               valueType="libs" />
          <option
                name="%Option.Posix.Libsearch"
                category="gnu.cpp.link.category.libs"
                command="-L"
                id="gnu.cpp.link.option.paths"
                browseType="directory"
-               valueType="libPaths">
-         </option>
+               valueType="libPaths" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.GroupLibs"
                category="gnu.cpp.link.category.libs"
                id="gnu.cpp.link.option.group"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.cpp.linker"
                name="%OptionCategory.Misc"
-               id="gnu.cpp.link.category.other">
-         </optionCategory>
+               id="gnu.cpp.link.category.other" />
          <option
                name="%Option.Posix.Linker.Flags"
                category="gnu.cpp.link.category.other"
                valueType="string"
-               id="gnu.cpp.link.option.flags">
-         </option>
+               id="gnu.cpp.link.option.flags" />
          <option
                name="%Option.Posix.Linker.XLinker"
                category="gnu.cpp.link.category.other"
                command="-Xlinker ${VALUE}"
                valueType="stringList"
-               id="gnu.cpp.link.option.other">
-         </option>
+               id="gnu.cpp.link.option.other" />
          <option
                name="%Option.Posix.UserObjs"
                category="gnu.cpp.link.category.other"
                browseType="file"
                valueType="userObjs"
-               id="gnu.cpp.link.option.userobjs">
-         </option>
+               id="gnu.cpp.link.option.userobjs" />
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.cpp.linker"
                name="%OptionCategory.Shared.Settings"
-               id="gnu.cpp.link.category.shared">
-         </optionCategory>
+               id="gnu.cpp.link.category.shared" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.Shared"
@@ -370,15 +328,15 @@ Contributors:
                command="-shared"
                valueType="boolean"
                id="gnu.cpp.link.option.shared">
-               <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="true"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="true"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+            </enablement>
          </option>
          <option
                name="%Option.Posix.Linker.SOName"
@@ -392,55 +350,49 @@ Contributors:
                category="gnu.cpp.link.category.shared"
                command="-Wl,--out-implib="
                valueType="string"
-               id="gnu.cpp.link.option.implname">
-         </option>
+               id="gnu.cpp.link.option.implname" />
          <option
                name="%Option.Posix.Linker.Defname"
                category="gnu.cpp.link.category.shared"
                command="-Wl,--output-def="
                valueType="string"
-               id="gnu.cpp.link.option.defname">
-         </option>
+               id="gnu.cpp.link.option.defname" />
          <inputType
-            sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
-            sources="o"
-			multipleOfType="true"
-            dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
-            buildVariable="OBJS"
-            id="cdt.managedbuild.tool.gnu.cpp.linker.input">
+               sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
+               sources="o"
+               multipleOfType="true"
+               dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
+               buildVariable="OBJS"
+               id="cdt.managedbuild.tool.gnu.cpp.linker.input">
             <additionalInput
-            	paths="$(USER_OBJS)"
-            	kind="additionalinputdependency">
-            </additionalInput>
+                  paths="$(USER_OBJS)"
+                  kind="additionalinputdependency" />
             <additionalInput
-            	paths="$(LIBS)"
-            	kind="additionalinput">
-            </additionalInput>
+                  paths="$(LIBS)"
+                  kind="additionalinput" />
          </inputType>
          <outputType
-			outputs=""
-            buildVariable="EXECUTABLES"
-            nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
-            id="cdt.managedbuild.tool.gnu.cpp.linker.output">
-              <enablement 
-              	type="ALL">
-			  	<checkOption 
-			  		optionId="gnu.cpp.link.option.shared"
-			  		value="false"/>
-			  </enablement>
+               outputs=""
+               buildVariable="EXECUTABLES"
+               nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
+               id="cdt.managedbuild.tool.gnu.cpp.linker.output">
+            <enablement type="ALL">
+               <checkOption
+                     optionId="gnu.cpp.link.option.shared"
+                     value="false" />
+            </enablement>
          </outputType>
          <outputType
-			  outputs="so"
-			  outputPrefix="lib"
-            nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
-	          buildVariable="LIBRARIES"
-              id="cdt.managedbuild.tool.gnu.cpp.linker.output.so">
-              <enablement 
-              	type="ALL">
-			  	<checkOption 
-			  		optionId="gnu.cpp.link.option.shared"
-			  		value="true"/>
-			  </enablement>
+               outputs="so"
+               outputPrefix="lib"
+               nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
+               buildVariable="LIBRARIES"
+               id="cdt.managedbuild.tool.gnu.cpp.linker.output.so">
+            <enablement type="ALL">
+               <checkOption
+                     optionId="gnu.cpp.link.option.shared"
+                     value="true" />
+            </enablement>
          </outputType>
          <option
                applicabilityCalculator="org.eclipse.cdt.managedbuilder.gnu.ui.ProfAppCalculator"
@@ -456,16 +408,14 @@ Contributors:
                defaultValue="false"
                id="gnu.cpp.link.option.debugging.gprof"
                name="%Option.Posix.Debug.gprof"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
-			  applicabilityCalculator="org.eclipse.cdt.managedbuilder.gnu.ui.GcovAppCalculator"
-			  command="-ftest-coverage -fprofile-arcs"
-			  defaultValue="false"
-			  id="gnu.cpp.link.option.debugging.codecov"
-			  name="%Option.codecov"
-			  valueType="boolean">
-		  </option>
+               applicabilityCalculator="org.eclipse.cdt.managedbuilder.gnu.ui.GcovAppCalculator"
+               command="-ftest-coverage -fprofile-arcs"
+               defaultValue="false"
+               id="gnu.cpp.link.option.debugging.codecov"
+               name="%Option.codecov"
+               valueType="boolean" />
       </tool>
       <tool
             natureFilter="both"
@@ -473,11 +423,11 @@ Contributors:
             name="%ToolName.archiver.gnu"
             command="ar"
             id="cdt.managedbuild.tool.gnu.archiver">
-            <supportedProperties>
+         <supportedProperties>
             <property id="org.eclipse.cdt.build.core.buildArtefactType">
-    	        <value id="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
+               <value id="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
             </property>
-            </supportedProperties>
+         </supportedProperties>
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.archiver"
                name="%OptionCategory.General"
@@ -488,30 +438,27 @@ Contributors:
                name="%Option.Posix.Archiver.Flags"
                category="gnu.lib.category.general"
                valueType="string"
-               id="gnu.both.lib.option.flags">
-         </option>
+               id="gnu.both.lib.option.flags" />
          <inputType
-            sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
-            sources="o"
-			multipleOfType="true"
-            dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
-            buildVariable="OBJS"
-            id="cdt.managedbuild.tool.gnu.archiver.input">
+               sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
+               sources="o"
+               multipleOfType="true"
+               dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
+               buildVariable="OBJS"
+               id="cdt.managedbuild.tool.gnu.archiver.input">
             <additionalInput
-            	paths="$(USER_OBJS)"
-            	kind="additionalinputdependency">
-            </additionalInput>
+                  paths="$(USER_OBJS)"
+                  kind="additionalinputdependency" />
             <additionalInput
-            	paths="$(LIBS)"
-            	kind="additionalinput">
-            </additionalInput>
+                  paths="$(LIBS)"
+                  kind="additionalinput" />
          </inputType>
          <outputType
-			outputs="a"
-            outputPrefix="lib"
-            buildVariable="ARCHIVES"
-            nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
-            id="cdt.managedbuild.tool.gnu.archiver.output">
+               outputs="a"
+               outputPrefix="lib"
+               buildVariable="ARCHIVES"
+               nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
+               id="cdt.managedbuild.tool.gnu.archiver.output">
          </outputType>
       </tool>
       <!--tool
@@ -526,7 +473,7 @@ Contributors:
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.windres"
                name="%OptionCategory.General"
-               id="gnu.windres.category.general"/>
+               id="gnu.windres.category.general" />
          <option
                valueType="enumerated"
                category="gnu.windres.category.general"
@@ -537,16 +484,16 @@ Contributors:
                   isDefault="true"
                   command="-O coff"
                   name="%Option.Windows.Windres.OutputFormat.Coff"
-                  id="gnu.windres.option.output.format.coff"/>
+                  id="gnu.windres.option.output.format.coff" />
             <enumeratedOptionValue
                   command="-O rc"
                   name="%Option.Windows.Windres.OutputFormat.RC"
-                  id="gnu.windres.option.output.format.rc"/>
+                  id="gnu.windres.option.output.format.rc" />
             <enumeratedOptionValue
                   isDefault="false"
                   command="-O res"
                   name="%Option.Windows.Windres.OutputFormat.Res"
-                  id="gnu.windres.option.output.format.res"/>
+                  id="gnu.windres.option.output.format.res" />
          </option>
          <option
                command="-v"
@@ -554,28 +501,28 @@ Contributors:
                valueType="boolean"
                category="gnu.windres.category.general"
                name="%Option.Posix.Verbose"
-               id="gnu.windres.option.verbose"/>
+               id="gnu.windres.option.verbose" />
          <option
                command="-I"
                valueType="includePath"
                category="gnu.windres.category.general"
                browseType="directory"
                name="%Option.Posix.InclPaths"
-               id="gnu.windres.option.preprocessor.include.paths"/>
+               id="gnu.windres.option.preprocessor.include.paths" />
          <option
                command="-D"
                valueType="definedSymbols"
                category="gnu.windres.category.general"
                browseType="none"
                name="%Option.Posix.DefSym"
-               id="gnu.windres.option.preprocessor.defined.symbols"/>
+               id="gnu.windres.option.preprocessor.defined.symbols" />
          <option
                command="-U"
                valueType="stringList"
                category="gnu.windres.category.general"
                browseType="none"
                name="%Option.Posix.UndefSym"
-               id="gnu.windres.option.preprocessor.undefined.symbols"/>
+               id="gnu.windres.option.preprocessor.undefined.symbols" />
       </tool-->
       <tool
             command="gcc"
@@ -587,8 +534,7 @@ Contributors:
          <optionCategory
                owner="cdt.managedbuild.tool.gnu.assembler"
                name="%OptionCategory.General"
-               id="gnu.asm.category.general">
-         </optionCategory>
+               id="gnu.asm.category.general" />
          <option
                category="gnu.asm.category.general"
                id="gnu.asm.option.debugging.level"
@@ -597,29 +543,29 @@ Contributors:
             <enumeratedOptionValue
                   name="%Option.Posix.Debug.None"
                   id="gnu.asm.debugging.level.none"
-                  isDefault="true"/>
+                  isDefault="true" />
             <enumeratedOptionValue
                   command="-g"
                   name="%Option.Posix.Debug.Def"
                   id="gnu.asm.debugging.level.default"
-                  isDefault="false"/>
-            <enablement 
+                  isDefault="false" />
+            <enablement
                   attribute="defaultValue"
                   extensionAdjustment="false"
                   type="CONTAINER_ATTRIBUTE"
                   value="gnu.asm.debugging.level.none">
                <checkBuildProperty
                      property="org.eclipse.cdt.build.core.buildType"
-                     value="org.eclipse.cdt.build.core.buildType.release"/>
+                     value="org.eclipse.cdt.build.core.buildType.release" />
             </enablement>
-            <enablement 
+            <enablement
                   attribute="defaultValue"
                   extensionAdjustment="false"
                   type="CONTAINER_ATTRIBUTE"
                   value="gnu.asm.debugging.level.default">
                <checkBuildProperty
                      property="org.eclipse.cdt.build.core.buildType"
-                     value="org.eclipse.cdt.build.core.buildType.debug"/>
+                     value="org.eclipse.cdt.build.core.buildType.debug" />
             </enablement>
          </option>
          <option
@@ -636,32 +582,30 @@ Contributors:
                category="gnu.asm.category.general"
                browseType="directory"
                name="%Option.Posix.InclPaths"
-               id="gnu.both.asm.option.include.paths"/>
+               id="gnu.both.asm.option.include.paths" />
          <option
                command="-W"
                defaultValue="false"
                valueType="boolean"
                category="gnu.asm.category.general"
                name="%Option.Gnu.Assembler.warn.suppress"
-               id="gnu.both.asm.option.warnings.nowarn"/>
+               id="gnu.both.asm.option.warnings.nowarn" />
          <option
                command="-v"
                defaultValue="false"
                valueType="boolean"
                category="gnu.asm.category.general"
                name="%Option.Gnu.Assembler.version"
-               id="gnu.both.asm.option.version"/>
+               id="gnu.both.asm.option.version" />
          <inputType
                id="cdt.managedbuild.tool.gnu.assembler.input"
                languageId="org.eclipse.cdt.core.assembly"
                sourceContentType="org.eclipse.cdt.core.asmSource"
-               sources="s,sx,S">
-         </inputType>
+               sources="s,sx,S" />
          <outputType
-			outputs="o"
-            buildVariable="OBJS"
-            id="cdt.managedbuild.tool.gnu.assembler.output">
-         </outputType>
+               outputs="o"
+               buildVariable="OBJS"
+               id="cdt.managedbuild.tool.gnu.assembler.output" />
       </tool>
       <tool
             natureFilter="cnature"
@@ -670,22 +614,20 @@ Contributors:
             command="gcc"
             id="cdt.managedbuild.tool.macosx.c.linker"
             errorParsers="org.eclipse.cdt.core.GLDErrorParser">
-            <supportedProperties>
+         <supportedProperties>
             <property id="org.eclipse.cdt.build.core.buildArtefactType">
-	            <value id="org.eclipse.cdt.build.core.buildArtefactType.exe"/>
-    	        <value id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
+               <value id="org.eclipse.cdt.build.core.buildArtefactType.exe" />
+               <value id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
             </property>
-            </supportedProperties>
-         <envVarBuildPath 
-         	pathType="buildpathLibrary"
-         	variableList="LIBRARY_PATH">
+         </supportedProperties>
+         <envVarBuildPath
+               pathType="buildpathLibrary"
+               variableList="LIBRARY_PATH">
          </envVarBuildPath>
-         
          <optionCategory
                owner="cdt.managedbuild.tool.macosx.c.linker"
                name="%OptionCategory.General"
-               id="macosx.c.link.category.general">
-         </optionCategory>
+               id="macosx.c.link.category.general" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoStartFiles"
@@ -693,15 +635,15 @@ Contributors:
                command="-nostartfiles"
                id="macosx.c.link.option.nostart"
                valueType="boolean">
-              <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="true"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="true"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+            </enablement>
          </option>
          <option
                defaultValue="false"
@@ -710,15 +652,15 @@ Contributors:
                command="-nodefaultlibs"
                id="macosx.c.link.option.nodeflibs"
                valueType="boolean">
-              <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="true"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="true"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+            </enablement>
          </option>
          <option
                defaultValue="false"
@@ -734,67 +676,57 @@ Contributors:
                category="macosx.c.link.category.general"
                command="-s"
                id="macosx.c.link.option.strip"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.Static"
                category="macosx.c.link.category.general"
                command="-static"
                id="macosx.c.link.option.noshared"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <optionCategory
                owner="cdt.managedbuild.tool.macosx.c.linker"
                name="%OptionCategory.Libs"
-               id="macosx.c.link.category.libs">
-         </optionCategory>
+               id="macosx.c.link.category.libs" />
          <option
                name="%Option.Posix.Libs"
                category="macosx.c.link.category.libs"
                command="-l"
                id="macosx.c.link.option.libs"
                browseType="none"
-               valueType="libs">
-         </option>
+               valueType="libs" />
          <option
                name="%Option.Posix.Libsearch"
                category="macosx.c.link.category.libs"
                command="-L"
                id="macosx.c.link.option.paths"
                browseType="directory"
-               valueType="libPaths">
-         </option>
+               valueType="libPaths" />
          <optionCategory
                owner="cdt.managedbuild.tool.macosx.c.linker"
                name="%OptionCategory.Misc"
-               id="macosx.c.link.category.other">
-         </optionCategory>
+               id="macosx.c.link.category.other" />
          <option
                name="%Option.Posix.Linker.Flags"
                category="macosx.c.link.category.other"
                valueType="string"
-               id="macosx.c.link.option.ldflags">
-         </option>
+               id="macosx.c.link.option.ldflags" />
          <option
                name="%Option.Posix.Linker.XLinker"
                category="macosx.c.link.category.other"
                command="-Xlinker ${VALUE}"
                valueType="stringList"
-               id="macosx.c.link.option.other">
-         </option>
+               id="macosx.c.link.option.other" />
          <option
                name="%Option.Posix.UserObjs"
                category="macosx.c.link.category.other"
                browseType="file"
                valueType="userObjs"
-               id="macosx.c.link.option.userobjs">
-         </option>
+               id="macosx.c.link.option.userobjs" />
          <optionCategory
                owner="cdt.managedbuild.tool.macosx.c.linker"
                name="%OptionCategory.Shared.Settings"
-               id="macosx.c.link.category.shared">
-         </optionCategory>
+               id="macosx.c.link.category.shared" />
          <option
                defaultValue="false"
                name="%Option.MacOSX.Linker.Shared"
@@ -802,57 +734,53 @@ Contributors:
                command="-dynamiclib"
                id="macosx.c.link.option.shared"
                valueType="boolean">
-              <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="true"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="true"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+            </enablement>
          </option>
          <inputType
-            sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
-            sources="o"
-			multipleOfType="true"
-            dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
-            buildVariable="OBJS"
-            id="cdt.managedbuild.tool.macosx.c.linker.input">
+               sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
+               sources="o"
+               multipleOfType="true"
+               dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
+               buildVariable="OBJS"
+               id="cdt.managedbuild.tool.macosx.c.linker.input">
             <additionalInput
-            	paths="$(USER_OBJS)"
-            	kind="additionalinputdependency">
-            </additionalInput>
+                  paths="$(USER_OBJS)"
+                  kind="additionalinputdependency" />
             <additionalInput
-            	paths="$(LIBS)"
-            	kind="additionalinput">
-            </additionalInput>
+                  paths="$(LIBS)"
+                  kind="additionalinput" />
          </inputType>
          <outputType
-			outputs=""
-            buildVariable="EXECUTABLES"
-            nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
-            id="cdt.managedbuild.tool.macosx.c.linker.output">
-              <enablement 
-              	type="ALL">
-			  	<checkOption 
-			  		optionId="macosx.c.link.option.shared"
-			  		value="false"/>
-			  </enablement>
+               outputs=""
+               buildVariable="EXECUTABLES"
+               nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
+               id="cdt.managedbuild.tool.macosx.c.linker.output">
+            <enablement type="ALL">
+               <checkOption
+                     optionId="macosx.c.link.option.shared"
+                     value="false" />
+            </enablement>
          </outputType>
          <outputType
-            outputs="dylib"
-            outputPrefix="lib"
-            nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
-            buildVariable="LIBRARIES"
-            id="cdt.managedbuild.tool.macosx.c.linker.output.so">
-              <enablement 
-              	type="ALL">
-			  	<checkOption 
-			  		optionId="macosx.c.link.option.shared"
-			  		value="true"/>
-			  </enablement>
-		  </outputType>
+               outputs="dylib"
+               outputPrefix="lib"
+               nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
+               buildVariable="LIBRARIES"
+               id="cdt.managedbuild.tool.macosx.c.linker.output.so">
+            <enablement type="ALL">
+               <checkOption
+                     optionId="macosx.c.link.option.shared"
+                     value="true" />
+            </enablement>
+         </outputType>
       </tool>
       <tool
             natureFilter="ccnature"
@@ -861,104 +789,91 @@ Contributors:
             command="g++"
             id="cdt.managedbuild.tool.macosx.cpp.linker"
             errorParsers="org.eclipse.cdt.core.GLDErrorParser">
-            <supportedProperties>
+         <supportedProperties>
             <property id="org.eclipse.cdt.build.core.buildArtefactType">
-	            <value id="org.eclipse.cdt.build.core.buildArtefactType.exe"/>
-    	        <value id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
+               <value id="org.eclipse.cdt.build.core.buildArtefactType.exe" />
+               <value id="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
             </property>
-            </supportedProperties>
-         <envVarBuildPath 
-         	pathType="buildpathLibrary"
-         	variableList="LIBRARY_PATH">
+         </supportedProperties>
+         <envVarBuildPath
+               pathType="buildpathLibrary"
+               variableList="LIBRARY_PATH">
          </envVarBuildPath>
          <optionCategory
                owner="cdt.managedbuild.tool.macosx.cpp.linker"
                name="%OptionCategory.General"
-               id="macosx.cpp.link.category.options">
-         </optionCategory>
+               id="macosx.cpp.link.category.options" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoStartFiles"
                category="macosx.cpp.link.category.options"
                command="-nostartfiles"
                id="macosx.cpp.link.option.nostart"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoDefLibs"
                category="macosx.cpp.link.category.options"
                command="-nodefaultlibs"
                id="macosx.cpp.link.option.nodeflibs"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.NoStdLibs"
                category="macosx.cpp.link.category.options"
                command="-nostdlib"
                id="macosx.cpp.link.option.nostdlibs"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <option
                defaultValue="false"
                name="%Option.Posix.Linker.Strip"
                category="macosx.cpp.link.category.options"
                command="-s"
                id="macosx.cpp.link.option.strip"
-               valueType="boolean">
-         </option>
+               valueType="boolean" />
          <optionCategory
                owner="cdt.managedbuild.tool.macosx.cpp.linker"
                name="%OptionCategory.Libs"
-               id="macosx.cpp.link.category.libs">
-         </optionCategory>
+               id="macosx.cpp.link.category.libs" />
          <option
                name="%Option.Posix.Libs"
                category="macosx.cpp.link.category.libs"
                command="-l"
                id="macosx.cpp.link.option.libs"
                browseType="none"
-               valueType="libs">
-         </option>
+               valueType="libs" />
          <option
                name="%Option.Posix.Libsearch"
                category="macosx.cpp.link.category.libs"
                command="-L"
                id="macosx.cpp.link.option.paths"
                browseType="directory"
-               valueType="libPaths">
-         </option>
+               valueType="libPaths" />
          <optionCategory
                owner="cdt.managedbuild.tool.macosx.cpp.linker"
                name="%OptionCategory.Misc"
-               id="macosx.cpp.link.category.other">
-         </optionCategory>
+               id="macosx.cpp.link.category.other" />
          <option
                name="%Option.Posix.Linker.Flags"
                category="macosx.cpp.link.category.other"
                valueType="string"
-               id="macosx.cpp.link.option.flags">
-         </option>
+               id="macosx.cpp.link.option.flags" />
          <option
                name="%Option.Posix.Linker.XLinker"
                category="macosx.cpp.link.category.other"
                command="-Xlinker ${VALUE}"
                valueType="stringList"
-               id="macosx.cpp.link.option.other">
-         </option>
+               id="macosx.cpp.link.option.other" />
          <option
                name="%Option.Posix.UserObjs"
                category="macosx.cpp.link.category.other"
                browseType="file"
                valueType="userObjs"
-               id="macosx.cpp.link.option.userobjs">
-         </option>
+               id="macosx.cpp.link.option.userobjs" />
          <optionCategory
                owner="cdt.managedbuild.tool.macosx.cpp.linker"
                name="%OptionCategory.Shared.Settings"
-               id="macosx.cpp.link.category.shared">
-         </optionCategory>
+               id="macosx.cpp.link.category.shared" />
          <option
                defaultValue="false"
                name="%Option.MacOSX.Linker.Shared"
@@ -966,1308 +881,1151 @@ Contributors:
                command="-dynamiclib"
                valueType="boolean"
                id="macosx.cpp.link.option.shared">
-             <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="true"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="true"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+            </enablement>
          </option>
          <inputType
-            sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
-            sources="o"
-			multipleOfType="true"
-            dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
-            buildVariable="OBJS"
-            id="cdt.managedbuild.tool.macosx.cpp.linker.input">
+               sourceContentType="org.eclipse.cdt.managedbuilder.core.compiledObjectFile"
+               sources="o"
+               multipleOfType="true"
+               dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.internal.DefaultNoDependencyCalculator"
+               buildVariable="OBJS"
+               id="cdt.managedbuild.tool.macosx.cpp.linker.input">
             <additionalInput
-            	paths="$(USER_OBJS)"
-            	kind="additionalinputdependency">
-            </additionalInput>
+                  paths="$(USER_OBJS)"
+                  kind="additionalinputdependency" />
             <additionalInput
-            	paths="$(LIBS)"
-            	kind="additionalinput">
-            </additionalInput>
+                  paths="$(LIBS)"
+                  kind="additionalinput" />
          </inputType>
          <outputType
-			outputs=""
-            buildVariable="EXECUTABLES"
-            nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
-            id="cdt.managedbuild.tool.macosx.cpp.linker.output">
-              <enablement 
-              	type="ALL">
-			  	<checkOption 
-			  		optionId="macosx.cpp.link.option.shared"
-			  		value="false"/>
-			  </enablement>
+               outputs=""
+               buildVariable="EXECUTABLES"
+               nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
+               id="cdt.managedbuild.tool.macosx.cpp.linker.output">
+            <enablement type="ALL">
+               <checkOption
+                     optionId="macosx.cpp.link.option.shared"
+                     value="false" />
+            </enablement>
          </outputType>
          <outputType
-            outputs="dylib"
-            outputPrefix="lib"
-            nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
-            buildVariable="LIBRARIES"
-            id="cdt.managedbuild.tool.macosx.cpp.linker.output.so">
-              <enablement 
-              	type="ALL">
-			  	<checkOption 
-			  		optionId="macosx.cpp.link.option.shared"
-			  		value="true"/>
-			  </enablement>
+               outputs="dylib"
+               outputPrefix="lib"
+               nameProvider="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuLinkOutputNameProvider"
+               buildVariable="LIBRARIES"
+               id="cdt.managedbuild.tool.macosx.cpp.linker.output.so">
+            <enablement type="ALL">
+               <checkOption
+                     optionId="macosx.cpp.link.option.shared"
+                     value="true" />
+            </enablement>
          </outputType>
       </tool>
-      
       <tool
-		  name="%ToolName.compiler.gnu.c"
-		  id="cdt.managedbuild.tool.gnu.c.compiler"
-		  isAbstract="true"
-		  command="gcc"
-		  natureFilter="both"
-		  outputFlag="-o"
-		  errorParsers="org.eclipse.cdt.core.GCCErrorParser">
-            <supportedProperties>
+            name="%ToolName.compiler.gnu.c"
+            id="cdt.managedbuild.tool.gnu.c.compiler"
+            isAbstract="true"
+            command="gcc"
+            natureFilter="both"
+            outputFlag="-o"
+            errorParsers="org.eclipse.cdt.core.GCCErrorParser">
+         <supportedProperties>
             <property id="org.eclipse.cdt.build.core.buildType">
-	            <value id="org.eclipse.cdt.build.core.buildType.debug"/>
-    	        <value id="org.eclipse.cdt.build.core.buildType.release"/>
+               <value id="org.eclipse.cdt.build.core.buildType.debug" />
+               <value id="org.eclipse.cdt.build.core.buildType.release" />
             </property>
-            </supportedProperties>
-         <envVarBuildPath 
-         	pathType="buildpathInclude"
-         	variableList="CPATH,C_INCLUDE_PATH">
+         </supportedProperties>
+         <envVarBuildPath
+               pathType="buildpathInclude"
+               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">
-		  </optionCategory>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Nostdinc"
-			  category="gnu.c.compiler.category.preprocessor"
-			  command="-nostdinc"
-			  id="gnu.c.compiler.option.preprocessor.nostdinc"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.PreprocOnly"
-			  category="gnu.c.compiler.category.preprocessor"
-			  command="-E"
-			  id="gnu.c.compiler.option.preprocessor.preprocess"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  name="%Option.Posix.DefSym"
-			  category="gnu.c.compiler.category.preprocessor"
-			  command="-D"
-			  id="gnu.c.compiler.option.preprocessor.def.symbols"
-			  valueType="definedSymbols">
-		  </option>
-		  <option
-			  name="%Option.Posix.UndefSym"
-			  category="gnu.c.compiler.category.preprocessor"
-			  command="-U"
-			  id="gnu.c.compiler.option.preprocessor.undef.symbol"
-			  valueType="undefDefinedSymbols">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.c.compiler"
-			  name="%OptionCategory.Dirs"
-			  id="gnu.c.compiler.category.dirs">
-		  </optionCategory>
-		  <option
-			  name="%Option.Posix.InclPaths"
-			  category="gnu.c.compiler.category.dirs"
-			  command="-I"
-			  id="gnu.c.compiler.option.include.paths"
-			  valueType="includePath"
-			  browseType="directory">
-		  </option>
-	      <option
-	          browseType="file"
-	          category="gnu.c.compiler.category.dirs"
-	          command="-include"
-	          id="gnu.c.compiler.option.include.files"
-	          name="%Option.Posix.InclFiles"
-	          valueType="includeFiles">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.c.compiler"
-			  name="%OptionCategory.Optimize"
-			  id="gnu.c.compiler.category.optimization">
-		  </optionCategory>
-		  <option
-			  name="%Option.Posix.OptLevel"
-			  category="gnu.c.compiler.category.optimization"
-			  id="gnu.c.compiler.option.optimization.level"
-			  valueType="enumerated">
-		  <enumeratedOptionValue
-		  		  name="%Option.Posix.Optimize.None"
-				  isDefault="false"
-				  command="-O0"
-				  id="gnu.c.optimization.level.none">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Optimize.Optimize"
-				  command="-O1"
-				  id="gnu.c.optimization.level.optimize">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Optimize.More"
-				  isDefault="true"
-				  command="-O2"
-				  id="gnu.c.optimization.level.more">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Optimize.Most"
-				  command="-O3"
-				  id="gnu.c.optimization.level.most">
-		  </enumeratedOptionValue>
-          <enumeratedOptionValue
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.c.compiler"
+               name="%OptionCategory.Dialect"
+               id="gnu.c.compiler.category.dialect" />
+         <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
+                  name="%Option.Posix.Dialect.c90"
+                  command="-std=c90"
+                  id="gnu.c.compiler.dialect.c90" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c99"
+                  command="-std=c99"
+                  id="gnu.c.compiler.dialect.c99" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c11"
+                  command="-std=c11"
+                  id="gnu.c.compiler.dialect.c11" />
+         </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" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Nostdinc"
+               category="gnu.c.compiler.category.preprocessor"
+               command="-nostdinc"
+               id="gnu.c.compiler.option.preprocessor.nostdinc"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.PreprocOnly"
+               category="gnu.c.compiler.category.preprocessor"
+               command="-E"
+               id="gnu.c.compiler.option.preprocessor.preprocess"
+               valueType="boolean" />
+         <option
+               name="%Option.Posix.DefSym"
+               category="gnu.c.compiler.category.preprocessor"
+               command="-D"
+               id="gnu.c.compiler.option.preprocessor.def.symbols"
+               valueType="definedSymbols" />
+         <option
+               name="%Option.Posix.UndefSym"
+               category="gnu.c.compiler.category.preprocessor"
+               command="-U"
+               id="gnu.c.compiler.option.preprocessor.undef.symbol"
+               valueType="undefDefinedSymbols" />
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.c.compiler"
+               name="%OptionCategory.Dirs"
+               id="gnu.c.compiler.category.dirs" />
+         <option
+               name="%Option.Posix.InclPaths"
+               category="gnu.c.compiler.category.dirs"
+               command="-I"
+               id="gnu.c.compiler.option.include.paths"
+               valueType="includePath"
+               browseType="directory" />
+         <option
+               browseType="file"
+               category="gnu.c.compiler.category.dirs"
+               command="-include"
+               id="gnu.c.compiler.option.include.files"
+               name="%Option.Posix.InclFiles"
+               valueType="includeFiles" />
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.c.compiler"
+               name="%OptionCategory.Optimize"
+               id="gnu.c.compiler.category.optimization" />
+         <option
+               name="%Option.Posix.OptLevel"
+               category="gnu.c.compiler.category.optimization"
+               id="gnu.c.compiler.option.optimization.level"
+               valueType="enumerated">
+            <enumeratedOptionValue
+                  name="%Option.Posix.Optimize.None"
+                  isDefault="false"
+                  command="-O0"
+                  id="gnu.c.optimization.level.none" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Optimize.Optimize"
+                  command="-O1"
+                  id="gnu.c.optimization.level.optimize" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Optimize.More"
+                  isDefault="true"
+                  command="-O2"
+                  id="gnu.c.optimization.level.more" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Optimize.Most"
+                  command="-O3"
+                  id="gnu.c.optimization.level.most" />
+            <enumeratedOptionValue
                   command="-Os"
                   id="gnu.c.optimization.level.size"
-                  name="%Option.Posix.Optimize.Size">
-          </enumeratedOptionValue>
-		      <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="gnu.c.optimization.level.most"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildType"
-			  		value="org.eclipse.cdt.build.core.buildType.release"/>
-			  </enablement>
-              <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="gnu.c.optimization.level.none"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildType"
-			  		value="org.eclipse.cdt.build.core.buildType.debug"/>
-			  </enablement>
-		  
-		  </option>
-		  <option
-			  name="%Option.Posix.Optimize.Flags"
-			  category="gnu.c.compiler.category.optimization"
-			  id="gnu.c.compiler.option.optimization.flags"
-			  valueType="string">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.c.compiler"
-			  name="%OptionCategory.Debug"
-			  id="gnu.c.compiler.category.debug">
-		  </optionCategory>
-		  <option
-			  name="%Option.Posix.DebugLevel"
-			  category="gnu.c.compiler.category.debug"
-			  id="gnu.c.compiler.option.debugging.level"
-			  valueType="enumerated">
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Debug.None"
-				  isDefault="false"
-				  id="gnu.c.debugging.level.none">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Debug.Min"
-				  command="-g1"
-				  id="gnu.c.debugging.level.minimal">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Debug.Def"
-				  isDefault="true"
-				  command="-g"
-				  id="gnu.c.debugging.level.default">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Debug.Max"
-				  isDefault="false"
-				  command="-g3"
-				  id="gnu.c.debugging.level.max">
-		  </enumeratedOptionValue>
-		      <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="gnu.c.debugging.level.none"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildType"
-			  		value="org.eclipse.cdt.build.core.buildType.release"/>
-			  </enablement>
-              <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="gnu.c.debugging.level.max"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildType"
-			  		value="org.eclipse.cdt.build.core.buildType.debug"/>
-			  </enablement>
-		  
-		  </option>
-		  <option
-			  name="%Option.Posix.Debug.Other"
-			  category="gnu.c.compiler.category.debug"
-			  id="gnu.c.compiler.option.debugging.other"
-			  valueType="string">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Debug.prof"
-			  category="gnu.c.compiler.category.debug"
-			  command="-p"
-			  id="gnu.c.compiler.option.debugging.prof"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Debug.gprof"
-			  category="gnu.c.compiler.category.debug"
-			  command="-pg"
-			  id="gnu.c.compiler.option.debugging.gprof"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  category="gnu.c.compiler.category.debug"
-			  command="-ftest-coverage -fprofile-arcs"
-			  defaultValue="false"
-			  id="gnu.c.compiler.option.debugging.codecov"
-			  name="%Option.codecov"
-			  tip="%Option.codecovTip"
-			  valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitaddress"
-		      category="gnu.c.compiler.category.debug"
-		      command="-fsanitize=address"
-		      id="gnu.c.compiler.option.debugging.sanitaddress"
-		      valueType="boolean">
-		  </option>
- 		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitpointers"
-		      category="gnu.c.compiler.category.debug"
-		      command="-fsanitize=pointer-compare -fsanitize=pointer-subtract"
-		      id="gnu.c.compiler.option.debugging.sanitpointers"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitthread"
-		      category="gnu.c.compiler.category.debug"
-		      command="-fsanitize=thread"
-		      id="gnu.c.compiler.option.debugging.sanitthread"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitleak"
-		      category="gnu.c.compiler.category.debug"
-		      command="-fsanitize=leak"
-		      id="gnu.c.compiler.option.debugging.sanitleak"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitundefined"
-		      category="gnu.c.compiler.category.debug"
-		      command="-fsanitize=undefined"
-		      id="gnu.c.compiler.option.debugging.sanitundef"
-		      valueType="boolean">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.c.compiler"
-			  name="%OptionCategory.Warn"
-			  id="gnu.c.compiler.category.warnings">
-		  </optionCategory>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.Syntax"
-			  category="gnu.c.compiler.category.warnings"
-			  command="-fsyntax-only"
-			  id="gnu.c.compiler.option.warnings.syntax"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.Pedandic"
-			  category="gnu.c.compiler.category.warnings"
-			  command="-pedantic"
-			  id="gnu.c.compiler.option.warnings.pedantic"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.PedErrors"
-			  category="gnu.c.compiler.category.warnings"
-			  command="-pedantic-errors"
-			  id="gnu.c.compiler.option.warnings.pedantic.error"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.nowarn"
-			  category="gnu.c.compiler.category.warnings"
-			  command="-w"
-			  id="gnu.c.compiler.option.warnings.nowarn"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="true"
-			  name="%Option.Posix.Warn.allwarn"
-			  category="gnu.c.compiler.category.warnings"
-			  command="-Wall"
-			  id="gnu.c.compiler.option.warnings.allwarn"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.extrawarn"
-			  category="gnu.c.compiler.category.warnings"
-			  command="-Wextra"
-			  id="gnu.c.compiler.option.warnings.extrawarn"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.toerrs"
-			  category="gnu.c.compiler.category.warnings"
-			  command="-Werror"
-			  id="gnu.c.compiler.option.warnings.toerrors"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.wconversion"
-			  category="gnu.c.compiler.category.warnings"
-			  command="-Wconversion"
-			  id="gnu.c.compiler.option.warnings.wconversion"
-			  valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wcastalign"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wcast-align"
-		      id="gnu.c.compiler.option.warnings.wcastalign"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wcastqual"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wcast-qual"
-		      id="gnu.c.compiler.option.warnings.wcastqual"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wdisabledopt"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wdisabled-optimization"
-		      id="gnu.c.compiler.option.warnings.wdisabledopt"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wlogicalop"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wlogical-op"
-		      id="gnu.c.compiler.option.warnings.wlogicalop"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wmissingdecl"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wmissing-declarations"
-		      id="gnu.c.compiler.option.warnings.wmissingdecl"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wmissingincdir"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wmissing-include-dirs"
-		      id="gnu.c.compiler.option.warnings.wmissingincdir"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wredundantdecl"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wredundant-decls"
-		      id="gnu.c.compiler.option.warnings.wredundantdecl"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wshadow"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wshadow"
-		      id="gnu.c.compiler.option.warnings.wshadow"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wsignconv"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wsign-conversion"
-		      id="gnu.c.compiler.option.warnings.wsignconv"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wswitchdef"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wswitch-default"
-		      id="gnu.c.compiler.option.warnings.wswitchdef"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wundef"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wundef"
-		      id="gnu.c.compiler.option.warnings.wundef"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wwritestring"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wwrite-strings"
-		      id="gnu.c.compiler.option.warnings.wwritestrings"
-		      valueType="boolean">
-		  </option>
-  		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wfloatequal"
-		      category="gnu.c.compiler.category.warnings"
-		      command="-Wfloat-equal"
-		      id="gnu.c.compiler.option.warnings.wfloatequal"
-		      valueType="boolean">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.c.compiler"
-			  name="%OptionCategory.Misc"
-			  id="gnu.c.compiler.category.other">
-		  </optionCategory>
-		  <option
-			  defaultValue="-c -fmessage-length=0"
-			  name="%Option.OtherFlags"
-			  category="gnu.c.compiler.category.other"
-			  id="gnu.c.compiler.option.misc.other"
-			  valueType="string">
-		  </option>
-		  <option
-			  defaultValue=""
-			  name="%Option.OtherFlagsExcludedFromScannerDiscovery"
-			  tip="%Option.OtherFlagsExcludedFromScannerDiscoveryTip"
-			  category="gnu.c.compiler.category.other"
-			  id="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery"
-			  excludeFromScannerDiscovery="true"
-			  valueType="string">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Verbose"
-			  category="gnu.c.compiler.category.other"
-			  command="-v"
-			  id="gnu.c.compiler.option.misc.verbose"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Ansi"
-			  category="gnu.c.compiler.category.other"
-			  command="-ansi"
-			  id="gnu.c.compiler.option.misc.ansi"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  category="gnu.c.compiler.category.other"
-			  command="-fPIC"
-			  defaultValue="false"
-			  id="gnu.c.compiler.option.misc.pic"
-			  name="%Option.PIC"
-			  valueType="boolean">
-		  </option>
-		  <option
-		      category="gnu.c.compiler.category.other"
-		      command="-fstack-protector-all -Wformat=2 -Wformat-security -Wstrict-overflow"
-		      defaultValue="false"
-		      id="gnu.c.compiler.option.misc.hardening"
-		      name="%Option.Security"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      category="gnu.c.compiler.category.other"
-		      command="-fPIE"
-		      defaultValue="false"
-		      id="gnu.c.compiler.option.misc.randomization"
-		      name="%Option.Randomization"
-		      valueType="boolean">
-		  </option>
-          <inputType
-              sourceContentType="org.eclipse.cdt.core.cSource"
-		      sources="c"
-              dependencyContentType="org.eclipse.cdt.core.cHeader"
-			  dependencyExtensions="h"
-			  dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.gnu.DefaultGCCDependencyCalculator2"
-              id="cdt.managedbuild.tool.gnu.c.compiler.input"
-              languageId="org.eclipse.cdt.core.gcc">
-          </inputType>
-          <outputType
-			  outputs="o"
-              buildVariable="OBJS"
-              id="cdt.managedbuild.tool.gnu.c.compiler.output">
-          </outputType>
-	  </tool>
-	  <tool
-		  name="%ToolName.compiler.gnu.cpp"
-		  id="cdt.managedbuild.tool.gnu.cpp.compiler"
-		  isAbstract="true"
-		  command="g++"
-		  natureFilter="ccnature"
-		  outputFlag="-o"
-		  errorParsers="org.eclipse.cdt.core.GCCErrorParser">
-            <supportedProperties>
+                  name="%Option.Posix.Optimize.Size" />
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="gnu.c.optimization.level.most"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.release" />
+            </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="gnu.c.optimization.level.none"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.debug" />
+            </enablement>
+         </option>
+         <option
+               name="%Option.Posix.Optimize.Flags"
+               category="gnu.c.compiler.category.optimization"
+               id="gnu.c.compiler.option.optimization.flags"
+               valueType="string">
+         </option>
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.c.compiler"
+               name="%OptionCategory.Debug"
+               id="gnu.c.compiler.category.debug" />
+         <option
+               name="%Option.Posix.DebugLevel"
+               category="gnu.c.compiler.category.debug"
+               id="gnu.c.compiler.option.debugging.level"
+               valueType="enumerated">
+            <enumeratedOptionValue
+                  name="%Option.Posix.Debug.None"
+                  isDefault="false"
+                  id="gnu.c.debugging.level.none" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Debug.Min"
+                  command="-g1"
+                  id="gnu.c.debugging.level.minimal" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Debug.Def"
+                  isDefault="true"
+                  command="-g"
+                  id="gnu.c.debugging.level.default" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Debug.Max"
+                  isDefault="false"
+                  command="-g3"
+                  id="gnu.c.debugging.level.max" />
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="gnu.c.debugging.level.none"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.release" />
+            </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="gnu.c.debugging.level.max"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.debug" />
+            </enablement>
+         </option>
+         <option
+               name="%Option.Posix.Debug.Other"
+               category="gnu.c.compiler.category.debug"
+               id="gnu.c.compiler.option.debugging.other"
+               valueType="string">
+         </option>
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.prof"
+               category="gnu.c.compiler.category.debug"
+               command="-p"
+               id="gnu.c.compiler.option.debugging.prof"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.gprof"
+               category="gnu.c.compiler.category.debug"
+               command="-pg"
+               id="gnu.c.compiler.option.debugging.gprof"
+               valueType="boolean" />
+         <option
+               category="gnu.c.compiler.category.debug"
+               command="-ftest-coverage -fprofile-arcs"
+               defaultValue="false"
+               id="gnu.c.compiler.option.debugging.codecov"
+               name="%Option.codecov"
+               tip="%Option.codecovTip"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitaddress"
+               category="gnu.c.compiler.category.debug"
+               command="-fsanitize=address"
+               id="gnu.c.compiler.option.debugging.sanitaddress"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitpointers"
+               category="gnu.c.compiler.category.debug"
+               command="-fsanitize=pointer-compare -fsanitize=pointer-subtract"
+               id="gnu.c.compiler.option.debugging.sanitpointers"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitthread"
+               category="gnu.c.compiler.category.debug"
+               command="-fsanitize=thread"
+               id="gnu.c.compiler.option.debugging.sanitthread"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitleak"
+               category="gnu.c.compiler.category.debug"
+               command="-fsanitize=leak"
+               id="gnu.c.compiler.option.debugging.sanitleak"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitundefined"
+               category="gnu.c.compiler.category.debug"
+               command="-fsanitize=undefined"
+               id="gnu.c.compiler.option.debugging.sanitundef"
+               valueType="boolean" />
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.c.compiler"
+               name="%OptionCategory.Warn"
+               id="gnu.c.compiler.category.warnings" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.Syntax"
+               category="gnu.c.compiler.category.warnings"
+               command="-fsyntax-only"
+               id="gnu.c.compiler.option.warnings.syntax"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.Pedandic"
+               category="gnu.c.compiler.category.warnings"
+               command="-pedantic"
+               id="gnu.c.compiler.option.warnings.pedantic"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.PedErrors"
+               category="gnu.c.compiler.category.warnings"
+               command="-pedantic-errors"
+               id="gnu.c.compiler.option.warnings.pedantic.error"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.nowarn"
+               category="gnu.c.compiler.category.warnings"
+               command="-w"
+               id="gnu.c.compiler.option.warnings.nowarn"
+               valueType="boolean" />
+         <option
+               defaultValue="true"
+               name="%Option.Posix.Warn.allwarn"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wall"
+               id="gnu.c.compiler.option.warnings.allwarn"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.extrawarn"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wextra"
+               id="gnu.c.compiler.option.warnings.extrawarn"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.toerrs"
+               category="gnu.c.compiler.category.warnings"
+               command="-Werror"
+               id="gnu.c.compiler.option.warnings.toerrors"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wconversion"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wconversion"
+               id="gnu.c.compiler.option.warnings.wconversion"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wcastalign"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wcast-align"
+               id="gnu.c.compiler.option.warnings.wcastalign"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wcastqual"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wcast-qual"
+               id="gnu.c.compiler.option.warnings.wcastqual"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wdisabledopt"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wdisabled-optimization"
+               id="gnu.c.compiler.option.warnings.wdisabledopt"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wlogicalop"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wlogical-op"
+               id="gnu.c.compiler.option.warnings.wlogicalop"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wmissingdecl"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wmissing-declarations"
+               id="gnu.c.compiler.option.warnings.wmissingdecl"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wmissingincdir"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wmissing-include-dirs"
+               id="gnu.c.compiler.option.warnings.wmissingincdir"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wredundantdecl"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wredundant-decls"
+               id="gnu.c.compiler.option.warnings.wredundantdecl"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wshadow"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wshadow"
+               id="gnu.c.compiler.option.warnings.wshadow"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wsignconv"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wsign-conversion"
+               id="gnu.c.compiler.option.warnings.wsignconv"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wswitchdef"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wswitch-default"
+               id="gnu.c.compiler.option.warnings.wswitchdef"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wundef"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wundef"
+               id="gnu.c.compiler.option.warnings.wundef"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wwritestring"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wwrite-strings"
+               id="gnu.c.compiler.option.warnings.wwritestrings"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wfloatequal"
+               category="gnu.c.compiler.category.warnings"
+               command="-Wfloat-equal"
+               id="gnu.c.compiler.option.warnings.wfloatequal"
+               valueType="boolean" />
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.c.compiler"
+               name="%OptionCategory.Misc"
+               id="gnu.c.compiler.category.other" />
+         <option
+               defaultValue="-c -fmessage-length=0"
+               name="%Option.OtherFlags"
+               category="gnu.c.compiler.category.other"
+               id="gnu.c.compiler.option.misc.other"
+               valueType="string" />
+         <option
+               defaultValue=""
+               name="%Option.OtherFlagsExcludedFromScannerDiscovery"
+               tip="%Option.OtherFlagsExcludedFromScannerDiscoveryTip"
+               category="gnu.c.compiler.category.other"
+               id="gnu.c.compiler.option.misc.otherExcludedFromScannerDiscovery"
+               excludeFromScannerDiscovery="true"
+               valueType="string" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Verbose"
+               category="gnu.c.compiler.category.other"
+               command="-v"
+               id="gnu.c.compiler.option.misc.verbose"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Ansi"
+               category="gnu.c.compiler.category.other"
+               command="-ansi"
+               id="gnu.c.compiler.option.misc.ansi"
+               valueType="boolean" />
+         <option
+               category="gnu.c.compiler.category.other"
+               command="-fPIC"
+               defaultValue="false"
+               id="gnu.c.compiler.option.misc.pic"
+               name="%Option.PIC"
+               valueType="boolean" />
+         <option
+               category="gnu.c.compiler.category.other"
+               command="-fstack-protector-all -Wformat=2 -Wformat-security -Wstrict-overflow"
+               defaultValue="false"
+               id="gnu.c.compiler.option.misc.hardening"
+               name="%Option.Security"
+               valueType="boolean" />
+         <option
+               category="gnu.c.compiler.category.other"
+               command="-fPIE"
+               defaultValue="false"
+               id="gnu.c.compiler.option.misc.randomization"
+               name="%Option.Randomization"
+               valueType="boolean" />
+         <inputType
+               sourceContentType="org.eclipse.cdt.core.cSource"
+               sources="c"
+               dependencyContentType="org.eclipse.cdt.core.cHeader"
+               dependencyExtensions="h"
+               dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.gnu.DefaultGCCDependencyCalculator2"
+               id="cdt.managedbuild.tool.gnu.c.compiler.input"
+               languageId="org.eclipse.cdt.core.gcc" />
+         <outputType
+               outputs="o"
+               buildVariable="OBJS"
+               id="cdt.managedbuild.tool.gnu.c.compiler.output" />
+      </tool>
+      <tool
+            name="%ToolName.compiler.gnu.cpp"
+            id="cdt.managedbuild.tool.gnu.cpp.compiler"
+            isAbstract="true"
+            command="g++"
+            natureFilter="ccnature"
+            outputFlag="-o"
+            errorParsers="org.eclipse.cdt.core.GCCErrorParser">
+         <supportedProperties>
             <property id="org.eclipse.cdt.build.core.buildType">
-	            <value id="org.eclipse.cdt.build.core.buildType.debug"/>
-    	        <value id="org.eclipse.cdt.build.core.buildType.release"/>
+               <value id="org.eclipse.cdt.build.core.buildType.debug" />
+               <value id="org.eclipse.cdt.build.core.buildType.release" />
             </property>
-            </supportedProperties>
-         <envVarBuildPath 
-         	pathType="buildpathInclude"
-         	variableList="CPATH,CPLUS_INCLUDE_PATH">
+         </supportedProperties>
+         <envVarBuildPath
+               pathType="buildpathInclude"
+               variableList="CPATH,CPLUS_INCLUDE_PATH">
          </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++14"
-					  command="-std=c++1y"
-					  id="gnu.cpp.compiler.dialect.c++1y">
-			  </enumeratedOptionValue>
-			  <enumeratedOptionValue
-					  name="%Option.Posix.Dialect.c++17"
-					  command="-std=c++17"
-					  id="gnu.cpp.compiler.dialect.c++17">
-			  </enumeratedOptionValue>
-			  <enumeratedOptionValue
-					  name="%Option.Posix.Dialect.c++2a"
-					  command="-std=c++2a"
-					  id="gnu.cpp.compiler.dialect.c++2a">
-			  </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>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Nostdinc"
-			  category="gnu.cpp.compiler.category.preprocessor"
-			  command="-nostdinc"
-			  id="gnu.cpp.compiler.option.preprocessor.nostdinc"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.PreprocOnly"
-			  category="gnu.cpp.compiler.category.preprocessor"
-			  command="-E"
-			  id="gnu.cpp.compiler.option.preprocessor.preprocess"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  name="%Option.Posix.DefSym"
-			  category="gnu.cpp.compiler.category.preprocessor"
-			  command="-D"
-			  id="gnu.cpp.compiler.option.preprocessor.def"
-			  valueType="definedSymbols">
-		  </option>
-		  <option
-			  name="%Option.Posix.UndefSym"
-			  category="gnu.cpp.compiler.category.preprocessor"
-			  command="-U"
-			  id="gnu.cpp.compiler.option.preprocessor.undef"
-			  valueType="undefDefinedSymbols">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.cpp.compiler"
-			  name="%OptionCategory.Dirs"
-			  id="gnu.cpp.compiler.category.dirs">
-		  </optionCategory>
-		  <option
-			  name="%Option.Posix.InclPaths"
-			  category="gnu.cpp.compiler.category.dirs"
-			  command="-I"
-			  id="gnu.cpp.compiler.option.include.paths"
-			  valueType="includePath"
-			  browseType="directory">
-		  </option>
-		  <option
-	          browseType="file"
-	          category="gnu.cpp.compiler.category.dirs"
-	          command="-include"
-	          id="gnu.cpp.compiler.option.include.files"
-	          name="%Option.Posix.InclFiles"
-	          valueType="includeFiles">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.cpp.compiler"
-			  name="%OptionCategory.Optimize"
-			  id="gnu.cpp.compiler.category.optimization">
-		  </optionCategory>
-		  <option
-			  name="%Option.Posix.OptLevel"
-			  category="gnu.cpp.compiler.category.optimization"
-			  id="gnu.cpp.compiler.option.optimization.level"
-			  valueType="enumerated">
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Optimize.None"
-				  command="-O0"
-				  id="gnu.cpp.compiler.optimization.level.none">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Optimize.Optimize"
-				  command="-O1"
-				  id="gnu.cpp.compiler.optimization.level.optimize">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Optimize.More"
-				  isDefault="true"
-				  command="-O2"
-				  id="gnu.cpp.compiler.optimization.level.more">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Optimize.Most"
-				  command="-O3"
-				  id="gnu.cpp.compiler.optimization.level.most">
-		  </enumeratedOptionValue>
-          <enumeratedOptionValue
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.cpp.compiler"
+               name="%OptionCategory.Dialect"
+               id="gnu.cpp.compiler.category.dialect" />
+         <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
+                  name="%Option.Posix.Dialect.c++98"
+                  command="-std=c++98"
+                  id="gnu.cpp.compiler.dialect.c++98" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c++11"
+                  command="-std=c++0x"
+                  id="gnu.cpp.compiler.dialect.c++11" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c++14"
+                  command="-std=c++1y"
+                  id="gnu.cpp.compiler.dialect.c++1y" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c++17"
+                  command="-std=c++17"
+                  id="gnu.cpp.compiler.dialect.c++17" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Dialect.c++2a"
+                  command="-std=c++2a"
+                  id="gnu.cpp.compiler.dialect.c++2a" />
+         </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" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Nostdinc"
+               category="gnu.cpp.compiler.category.preprocessor"
+               command="-nostdinc"
+               id="gnu.cpp.compiler.option.preprocessor.nostdinc"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.PreprocOnly"
+               category="gnu.cpp.compiler.category.preprocessor"
+               command="-E"
+               id="gnu.cpp.compiler.option.preprocessor.preprocess"
+               valueType="boolean" />
+         <option
+               name="%Option.Posix.DefSym"
+               category="gnu.cpp.compiler.category.preprocessor"
+               command="-D"
+               id="gnu.cpp.compiler.option.preprocessor.def"
+               valueType="definedSymbols" />
+         <option
+               name="%Option.Posix.UndefSym"
+               category="gnu.cpp.compiler.category.preprocessor"
+               command="-U"
+               id="gnu.cpp.compiler.option.preprocessor.undef"
+               valueType="undefDefinedSymbols" />
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.cpp.compiler"
+               name="%OptionCategory.Dirs"
+               id="gnu.cpp.compiler.category.dirs" />
+         <option
+               name="%Option.Posix.InclPaths"
+               category="gnu.cpp.compiler.category.dirs"
+               command="-I"
+               id="gnu.cpp.compiler.option.include.paths"
+               valueType="includePath"
+               browseType="directory" />
+         <option
+               browseType="file"
+               category="gnu.cpp.compiler.category.dirs"
+               command="-include"
+               id="gnu.cpp.compiler.option.include.files"
+               name="%Option.Posix.InclFiles"
+               valueType="includeFiles" />
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.cpp.compiler"
+               name="%OptionCategory.Optimize"
+               id="gnu.cpp.compiler.category.optimization" />
+         <option
+               name="%Option.Posix.OptLevel"
+               category="gnu.cpp.compiler.category.optimization"
+               id="gnu.cpp.compiler.option.optimization.level"
+               valueType="enumerated">
+            <enumeratedOptionValue
+                  name="%Option.Posix.Optimize.None"
+                  command="-O0"
+                  id="gnu.cpp.compiler.optimization.level.none" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Optimize.Optimize"
+                  command="-O1"
+                  id="gnu.cpp.compiler.optimization.level.optimize" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Optimize.More"
+                  isDefault="true"
+                  command="-O2"
+                  id="gnu.cpp.compiler.optimization.level.more" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Optimize.Most"
+                  command="-O3"
+                  id="gnu.cpp.compiler.optimization.level.most" />
+            <enumeratedOptionValue
                   command="-Os"
                   id="gnu.cpp.compiler.optimization.level.size"
-                  name="%Option.Posix.Optimize.Size">
-          </enumeratedOptionValue>
-		      <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="value" 
-              	value="gnu.cpp.compiler.optimization.level.most"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildType"
-			  		value="org.eclipse.cdt.build.core.buildType.release"/>
-			  </enablement>
-              <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="value" 
-              	value="gnu.cpp.compiler.optimization.level.none"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildType"
-			  		value="org.eclipse.cdt.build.core.buildType.debug"/>
-			  </enablement>		  
-		  </option>
-		  <option
-			  name="%Option.Posix.Optimize.Flags"
-			  category="gnu.cpp.compiler.category.optimization"
-			  id="gnu.cpp.compiler.option.optimization.flags"
-			  valueType="string">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.cpp.compiler"
-			  name="%OptionCategory.Debug"
-			  id="gnu.cpp.compiler.category.debug">
-		  </optionCategory>
-		  <option
-			  name="%Option.Posix.DebugLevel"
-			  category="gnu.cpp.compiler.category.debug"
-			  id="gnu.cpp.compiler.option.debugging.level"
-			  valueType="enumerated">
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Debug.None"
-				  isDefault="false"
-				  id="gnu.cpp.compiler.debugging.level.none">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Debug.Min"
-				  command="-g1"
-				  id="gnu.cpp.compiler.debugging.level.minimal">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Debug.Def"
-				  isDefault="true"
-				  command="-g"
-				  id="gnu.cpp.compiler.debugging.level.default">
-		  </enumeratedOptionValue>
-		  <enumeratedOptionValue
-				  name="%Option.Posix.Debug.Max"
-				  isDefault="false"
-				  command="-g3"
-				  id="gnu.cpp.compiler.debugging.level.max">
-		  </enumeratedOptionValue>
-		  	 <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="gnu.cpp.compiler.debugging.level.none"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildType"
-			  		value="org.eclipse.cdt.build.core.buildType.release"/>
-			  </enablement>
-              <enablement 
-              	type="CONTAINER_ATTRIBUTE" 
-              	attribute="defaultValue" 
-              	value="gnu.cpp.compiler.debugging.level.max"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildType"
-			  		value="org.eclipse.cdt.build.core.buildType.debug"/>
-			  </enablement>		  
-		  
-		  </option>
-		  <option
-			  name="%Option.Posix.Debug.Other"
-			  category="gnu.cpp.compiler.category.debug"
-			  id="gnu.cpp.compiler.option.debugging.other"
-			  valueType="string">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Debug.prof"
-			  category="gnu.cpp.compiler.category.debug"
-			  command="-p"
-			  id="gnu.cpp.compiler.option.debugging.prof"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Debug.gprof"
-			  category="gnu.cpp.compiler.category.debug"
-			  command="-pg"
-			  id="gnu.cpp.compiler.option.debugging.gprof"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.codecov"
-			  category="gnu.cpp.compiler.category.debug"
-			  command="-ftest-coverage -fprofile-arcs"
-			  id="gnu.cpp.compiler.option.debugging.codecov"
-			  tip="%Option.codecovTip"
-			  valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitaddress"
-		      category="gnu.cpp.compiler.category.debug"
-		      command="-fsanitize=address"
-		      id="gnu.cpp.compiler.option.debugging.sanitaddress"
-		      valueType="boolean">
-		  </option>
- 		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitpointers"
-		      category="gnu.cpp.compiler.category.debug"
-		      command="-fsanitize=pointer-compare -fsanitize=pointer-subtract"
-		      id="gnu.cpp.compiler.option.debugging.sanitpointers"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitthread"
-		      category="gnu.cpp.compiler.category.debug"
-		      command="-fsanitize=thread"
-		      id="gnu.cpp.compiler.option.debugging.sanitthread"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitleak"
-		      category="gnu.cpp.compiler.category.debug"
-		      command="-fsanitize=leak"
-		      id="gnu.cpp.compiler.option.debugging.sanitleak"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Debug.sanitundefined"
-		      category="gnu.cpp.compiler.category.debug"
-		      command="-fsanitize=undefined"
-		      id="gnu.cpp.compiler.option.debugging.sanitundef"
-		      valueType="boolean">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.cpp.compiler"
-			  name="%OptionCategory.Warn"
-			  id="gnu.cpp.compiler.category.warnings">
-		  </optionCategory>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.Syntax"
-			  category="gnu.cpp.compiler.category.warnings"
-			  command="-fsyntax-only"
-			  id="gnu.cpp.compiler.option.warnings.syntax"
-			  valueType="boolean">
-		   </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.Pedandic"
-			  category="gnu.cpp.compiler.category.warnings"
-			  command="-pedantic"
-			  id="gnu.cpp.compiler.option.warnings.pedantic"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.PedErrors"
-			  category="gnu.cpp.compiler.category.warnings"
-			  command="-pedantic-errors"
-			  id="gnu.cpp.compiler.option.warnings.pedantic.error"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.nowarn"
-			  category="gnu.cpp.compiler.category.warnings"
-			  command="-w"
-			  id="gnu.cpp.compiler.option.warnings.nowarn"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="true"
-			  name="%Option.Posix.Warn.allwarn"
-			  category="gnu.cpp.compiler.category.warnings"
-			  command="-Wall"
-			  id="gnu.cpp.compiler.option.warnings.allwarn"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.extrawarn"
-			  category="gnu.cpp.compiler.category.warnings"
-			  command="-Wextra"
-			  id="gnu.cpp.compiler.option.warnings.extrawarn"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.toerrs"
-			  category="gnu.cpp.compiler.category.warnings"
-			  command="-Werror"
-			  id="gnu.cpp.compiler.option.warnings.toerrors"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Warn.wconversion"
-			  category="gnu.cpp.compiler.category.warnings"
-			  command="-Wconversion"
-			  id="gnu.cpp.compiler.option.warnings.wconversion"
-			  valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wcastalign"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wcast-align"
-		      id="gnu.cpp.compiler.option.warnings.wcastalign"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wcastqual"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wcast-qual"
-		      id="gnu.cpp.compiler.option.warnings.wcastqual"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wctordtorprivacy"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wctor-dtor-privacy"
-		      id="gnu.cpp.compiler.option.warnings.wctordtorprivacy"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wdisabledopt"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wdisabled-optimization"
-		      id="gnu.cpp.compiler.option.warnings.wdisabledopt"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wlogicalop"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wlogical-op"
-		      id="gnu.cpp.compiler.option.warnings.wlogicalop"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wmissingdecl"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wmissing-declarations"
-		      id="gnu.cpp.compiler.option.warnings.wmissingdecl"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wmissingincdir"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wmissing-include-dirs"
-		      id="gnu.cpp.compiler.option.warnings.wmissingincdir"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wnoexccept"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wnoexcept"
-		      id="gnu.cpp.compiler.option.warnings.wnoexccept"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.woldstylecast"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wold-style-cast"
-		      id="gnu.cpp.compiler.option.warnings.woldstylecast"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.woverloadedvirtual"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Woverloaded-virtual"
-		      id="gnu.cpp.compiler.option.warnings.woverloadedvirtual"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wredundantdecl"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wredundant-decls"
-		      id="gnu.cpp.compiler.option.warnings.wredundantdecl"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wshadow"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wshadow"
-		      id="gnu.cpp.compiler.option.warnings.wshadow"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wsignconv"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wsign-conversion"
-		      id="gnu.cpp.compiler.option.warnings.wsignconv"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wsignpromo"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wsign-promo"
-		      id="gnu.cpp.compiler.option.warnings.wsignpromo"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wstrictnullsent"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wstrict-null-sentinel"
-		      id="gnu.cpp.compiler.option.warnings.wstrictnullsent"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wswitchdef"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wswitch-default"
-		      id="gnu.cpp.compiler.option.warnings.wswitchdef"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wundef"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wundef"
-		      id="gnu.cpp.compiler.option.warnings.wundef"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.weffcpp"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Weffc++"
-		      id="gnu.cpp.compiler.option.warnings.weffcpp"
-		      valueType="boolean">
-		  </option>
-		  <option
-		      defaultValue="false"
-		      name="%Option.Posix.Warn.wfloatequal"
-		      category="gnu.cpp.compiler.category.warnings"
-		      command="-Wfloat-equal"
-		      id="gnu.cpp.compiler.option.warnings.wfloatequal"
-		      valueType="boolean">
-		  </option>
-		  <optionCategory
-			  owner="cdt.managedbuild.tool.gnu.cpp.compiler"
-			  name="%OptionCategory.Misc"
-			  id="gnu.cpp.compiler.category.other">
-		  </optionCategory>
-		  <option
-			  defaultValue="-c -fmessage-length=0"
-			  name="%Option.OtherFlags"
-			  category="gnu.cpp.compiler.category.other"
-			  id="gnu.cpp.compiler.option.other.other"
-			  valueType="string">
-		  </option>
-		  <option
-			  defaultValue=""
-			  name="%Option.OtherFlagsExcludedFromScannerDiscovery"
-			  tip="%Option.OtherFlagsExcludedFromScannerDiscoveryTip"
-			  category="gnu.cpp.compiler.category.other"
-			  id="gnu.cpp.compiler.option.other.otherExcludedFromScannerDiscovery"
-			  excludeFromScannerDiscovery="true"
-			  valueType="string">
-		  </option>
-		  <option
-			  defaultValue="false"
-			  name="%Option.Posix.Verbose"
-			  category="gnu.cpp.compiler.category.other"
-			  command="-v"
-			  id="gnu.cpp.compiler.option.other.verbose"
-			  valueType="boolean">
-		  </option>
-		  <option
-			  category="gnu.cpp.compiler.category.other"
-			  command="-fPIC"
-			  defaultValue="false"
-			  id="gnu.cpp.compiler.option.other.pic"
-			  name="%Option.PIC"
-			  valueType="boolean">
-		  </option>
-	      <option
-		      category="gnu.cpp.compiler.category.other"
-		      command="-fstack-protector-all -Wformat=2 -Wformat-security -Wstrict-overflow"
-		      defaultValue="false"
-		      id="gnu.cpp.compiler.option.misc.hardening"
-		      name="%Option.Security"
-		      valueType="boolean">
-		  </option>
-		  <option
-              category="gnu.cpp.compiler.category.other"
-		      command="-fPIE"
-		      defaultValue="false"
-		      id="gnu.cpp.compiler.option.misc.randomization"
-		      name="%Option.Randomization"
-		      valueType="boolean">
-		  </option>
-          <inputType
-              sourceContentType="org.eclipse.cdt.core.cxxSource"
-			  sources="c,C,cc,cxx,cpp,cp,CPP,ccm,cxxm,c++m"
-              dependencyContentType="org.eclipse.cdt.core.cxxHeader"
-			  dependencyExtensions="h,H,hpp,hh,hp,hxx,HPP,h++,tcc"
-			  dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.gnu.DefaultGCCDependencyCalculator2"
-              id="cdt.managedbuild.tool.gnu.cpp.compiler.input"
-              languageId="org.eclipse.cdt.core.g++">
-          </inputType>
-          <outputType
-			  outputs="o"
-              buildVariable="OBJS"
-              id="cdt.managedbuild.tool.gnu.cpp.compiler.output">
-          </outputType>
-	  </tool>
-      
-      <tool
-          id="cdt.managedbuild.tool.gnu.c.linker.cygwin"
-          name="%ToolName.linker.cygwin.gnu.c"
-          superClass="cdt.managedbuild.tool.gnu.c.linker">
-          <envVarBuildPath 
-              pathType="buildpathLibrary"
-              variableList="LIBRARY_PATH"
-              buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver">
-          </envVarBuildPath>
-          <outputType
-			  outputs="exe"
-              superClass="cdt.managedbuild.tool.gnu.c.linker.output"
-              id="cdt.managedbuild.tool.gnu.c.linker.cygwin.output">
-          </outputType>
-		  <outputType
-	          outputs="dll,a.dll"
-	          outputPrefix=""
-			  buildVariable="LIBRARIES"
-			  id="cdt.managedbuild.tool.gnu.c.linker.cygwin.output.so"
-			  superClass="cdt.managedbuild.tool.gnu.c.linker.output.so">
-	      </outputType>
+                  name="%Option.Posix.Optimize.Size" />
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="value"
+                  value="gnu.cpp.compiler.optimization.level.most"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.release" />
+            </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="value"
+                  value="gnu.cpp.compiler.optimization.level.none"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.debug" />
+            </enablement>
+         </option>
+         <option
+               name="%Option.Posix.Optimize.Flags"
+               category="gnu.cpp.compiler.category.optimization"
+               id="gnu.cpp.compiler.option.optimization.flags"
+               valueType="string">
+         </option>
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.cpp.compiler"
+               name="%OptionCategory.Debug"
+               id="gnu.cpp.compiler.category.debug" />
+         <option
+               name="%Option.Posix.DebugLevel"
+               category="gnu.cpp.compiler.category.debug"
+               id="gnu.cpp.compiler.option.debugging.level"
+               valueType="enumerated">
+            <enumeratedOptionValue
+                  name="%Option.Posix.Debug.None"
+                  isDefault="false"
+                  id="gnu.cpp.compiler.debugging.level.none" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Debug.Min"
+                  command="-g1"
+                  id="gnu.cpp.compiler.debugging.level.minimal" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Debug.Def"
+                  isDefault="true"
+                  command="-g"
+                  id="gnu.cpp.compiler.debugging.level.default" />
+            <enumeratedOptionValue
+                  name="%Option.Posix.Debug.Max"
+                  isDefault="false"
+                  command="-g3"
+                  id="gnu.cpp.compiler.debugging.level.max" />
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="gnu.cpp.compiler.debugging.level.none"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.release" />
+            </enablement>
+            <enablement
+                  type="CONTAINER_ATTRIBUTE"
+                  attribute="defaultValue"
+                  value="gnu.cpp.compiler.debugging.level.max"
+                  extensionAdjustment="false">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildType"
+                     value="org.eclipse.cdt.build.core.buildType.debug" />
+            </enablement>
+         </option>
+         <option
+               name="%Option.Posix.Debug.Other"
+               category="gnu.cpp.compiler.category.debug"
+               id="gnu.cpp.compiler.option.debugging.other"
+               valueType="string">
+         </option>
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.prof"
+               category="gnu.cpp.compiler.category.debug"
+               command="-p"
+               id="gnu.cpp.compiler.option.debugging.prof"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.gprof"
+               category="gnu.cpp.compiler.category.debug"
+               command="-pg"
+               id="gnu.cpp.compiler.option.debugging.gprof"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.codecov"
+               category="gnu.cpp.compiler.category.debug"
+               command="-ftest-coverage -fprofile-arcs"
+               id="gnu.cpp.compiler.option.debugging.codecov"
+               tip="%Option.codecovTip"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitaddress"
+               category="gnu.cpp.compiler.category.debug"
+               command="-fsanitize=address"
+               id="gnu.cpp.compiler.option.debugging.sanitaddress"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitpointers"
+               category="gnu.cpp.compiler.category.debug"
+               command="-fsanitize=pointer-compare -fsanitize=pointer-subtract"
+               id="gnu.cpp.compiler.option.debugging.sanitpointers"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitthread"
+               category="gnu.cpp.compiler.category.debug"
+               command="-fsanitize=thread"
+               id="gnu.cpp.compiler.option.debugging.sanitthread"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitleak"
+               category="gnu.cpp.compiler.category.debug"
+               command="-fsanitize=leak"
+               id="gnu.cpp.compiler.option.debugging.sanitleak"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Debug.sanitundefined"
+               category="gnu.cpp.compiler.category.debug"
+               command="-fsanitize=undefined"
+               id="gnu.cpp.compiler.option.debugging.sanitundef"
+               valueType="boolean" />
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.cpp.compiler"
+               name="%OptionCategory.Warn"
+               id="gnu.cpp.compiler.category.warnings" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.Syntax"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-fsyntax-only"
+               id="gnu.cpp.compiler.option.warnings.syntax"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.Pedandic"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-pedantic"
+               id="gnu.cpp.compiler.option.warnings.pedantic"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.PedErrors"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-pedantic-errors"
+               id="gnu.cpp.compiler.option.warnings.pedantic.error"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.nowarn"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-w"
+               id="gnu.cpp.compiler.option.warnings.nowarn"
+               valueType="boolean" />
+         <option
+               defaultValue="true"
+               name="%Option.Posix.Warn.allwarn"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wall"
+               id="gnu.cpp.compiler.option.warnings.allwarn"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.extrawarn"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wextra"
+               id="gnu.cpp.compiler.option.warnings.extrawarn"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.toerrs"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Werror"
+               id="gnu.cpp.compiler.option.warnings.toerrors"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wconversion"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wconversion"
+               id="gnu.cpp.compiler.option.warnings.wconversion"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wcastalign"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wcast-align"
+               id="gnu.cpp.compiler.option.warnings.wcastalign"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wcastqual"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wcast-qual"
+               id="gnu.cpp.compiler.option.warnings.wcastqual"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wctordtorprivacy"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wctor-dtor-privacy"
+               id="gnu.cpp.compiler.option.warnings.wctordtorprivacy"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wdisabledopt"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wdisabled-optimization"
+               id="gnu.cpp.compiler.option.warnings.wdisabledopt"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wlogicalop"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wlogical-op"
+               id="gnu.cpp.compiler.option.warnings.wlogicalop"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wmissingdecl"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wmissing-declarations"
+               id="gnu.cpp.compiler.option.warnings.wmissingdecl"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wmissingincdir"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wmissing-include-dirs"
+               id="gnu.cpp.compiler.option.warnings.wmissingincdir"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wnoexccept"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wnoexcept"
+               id="gnu.cpp.compiler.option.warnings.wnoexccept"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.woldstylecast"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wold-style-cast"
+               id="gnu.cpp.compiler.option.warnings.woldstylecast"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.woverloadedvirtual"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Woverloaded-virtual"
+               id="gnu.cpp.compiler.option.warnings.woverloadedvirtual"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wredundantdecl"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wredundant-decls"
+               id="gnu.cpp.compiler.option.warnings.wredundantdecl"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wshadow"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wshadow"
+               id="gnu.cpp.compiler.option.warnings.wshadow"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wsignconv"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wsign-conversion"
+               id="gnu.cpp.compiler.option.warnings.wsignconv"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wsignpromo"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wsign-promo"
+               id="gnu.cpp.compiler.option.warnings.wsignpromo"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wstrictnullsent"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wstrict-null-sentinel"
+               id="gnu.cpp.compiler.option.warnings.wstrictnullsent"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wswitchdef"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wswitch-default"
+               id="gnu.cpp.compiler.option.warnings.wswitchdef"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wundef"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wundef"
+               id="gnu.cpp.compiler.option.warnings.wundef"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.weffcpp"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Weffc++"
+               id="gnu.cpp.compiler.option.warnings.weffcpp"
+               valueType="boolean" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Warn.wfloatequal"
+               category="gnu.cpp.compiler.category.warnings"
+               command="-Wfloat-equal"
+               id="gnu.cpp.compiler.option.warnings.wfloatequal"
+               valueType="boolean" />
+         <optionCategory
+               owner="cdt.managedbuild.tool.gnu.cpp.compiler"
+               name="%OptionCategory.Misc"
+               id="gnu.cpp.compiler.category.other" />
+         <option
+               defaultValue="-c -fmessage-length=0"
+               name="%Option.OtherFlags"
+               category="gnu.cpp.compiler.category.other"
+               id="gnu.cpp.compiler.option.other.other"
+               valueType="string" />
+         <option
+               defaultValue=""
+               name="%Option.OtherFlagsExcludedFromScannerDiscovery"
+               tip="%Option.OtherFlagsExcludedFromScannerDiscoveryTip"
+               category="gnu.cpp.compiler.category.other"
+               id="gnu.cpp.compiler.option.other.otherExcludedFromScannerDiscovery"
+               excludeFromScannerDiscovery="true"
+               valueType="string" />
+         <option
+               defaultValue="false"
+               name="%Option.Posix.Verbose"
+               category="gnu.cpp.compiler.category.other"
+               command="-v"
+               id="gnu.cpp.compiler.option.other.verbose"
+               valueType="boolean" />
+         <option
+               category="gnu.cpp.compiler.category.other"
+               command="-fPIC"
+               defaultValue="false"
+               id="gnu.cpp.compiler.option.other.pic"
+               name="%Option.PIC"
+               valueType="boolean" />
+         <option
+               category="gnu.cpp.compiler.category.other"
+               command="-fstack-protector-all -Wformat=2 -Wformat-security -Wstrict-overflow"
+               defaultValue="false"
+               id="gnu.cpp.compiler.option.misc.hardening"
+               name="%Option.Security"
+               valueType="boolean" />
+         <option
+               category="gnu.cpp.compiler.category.other"
+               command="-fPIE"
+               defaultValue="false"
+               id="gnu.cpp.compiler.option.misc.randomization"
+               name="%Option.Randomization"
+               valueType="boolean" />
+         <inputType
+               sourceContentType="org.eclipse.cdt.core.cxxSource"
+               sources="c,C,cc,cxx,cpp,cp,CPP,ccm,cxxm,c++m"
+               dependencyContentType="org.eclipse.cdt.core.cxxHeader"
+               dependencyExtensions="h,H,hpp,hh,hp,hxx,HPP,h++,tcc"
+               dependencyCalculator="org.eclipse.cdt.managedbuilder.makegen.gnu.DefaultGCCDependencyCalculator2"
+               id="cdt.managedbuild.tool.gnu.cpp.compiler.input"
+               languageId="org.eclipse.cdt.core.g++" />
+         <outputType
+               outputs="o"
+               buildVariable="OBJS"
+               id="cdt.managedbuild.tool.gnu.cpp.compiler.output" />
       </tool>
       <tool
-          id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin"
-          name="%ToolName.linker.cygwin.gnu.cpp"
-          superClass="cdt.managedbuild.tool.gnu.cpp.linker">
-          <envVarBuildPath 
-              pathType="buildpathLibrary"
-              variableList="LIBRARY_PATH"
-              buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver">
-          </envVarBuildPath>
-		  <outputType
-			  outputs="exe"
-              superClass="cdt.managedbuild.tool.gnu.cpp.linker.output"
-			  id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output">
-		  </outputType>
-		  <outputType
-	          outputs="dll,a.dll"
-	          outputPrefix=""
-			  buildVariable="LIBRARIES"
-			  id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output.so"
-			  superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so">
-	      </outputType>
-		  
+            id="cdt.managedbuild.tool.gnu.c.linker.cygwin"
+            name="%ToolName.linker.cygwin.gnu.c"
+            superClass="cdt.managedbuild.tool.gnu.c.linker">
+         <envVarBuildPath
+               pathType="buildpathLibrary"
+               variableList="LIBRARY_PATH"
+               buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver" />
+         <outputType
+               outputs="exe"
+               superClass="cdt.managedbuild.tool.gnu.c.linker.output"
+               id="cdt.managedbuild.tool.gnu.c.linker.cygwin.output" />
+         <outputType
+               outputs="dll,a.dll"
+               outputPrefix=""
+               buildVariable="LIBRARIES"
+               id="cdt.managedbuild.tool.gnu.c.linker.cygwin.output.so"
+               superClass="cdt.managedbuild.tool.gnu.c.linker.output.so" />
       </tool>
       <tool
-          id="cdt.managedbuild.tool.gnu.c.compiler.cygwin"
-          name="%ToolName.compiler.cygwin.gnu.c"
-          superClass="cdt.managedbuild.tool.gnu.c.compiler">
-          <envVarBuildPath 
-              pathType="buildpathInclude"
-              variableList="CPATH,C_INCLUDE_PATH"
-              buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver">
-          </envVarBuildPath>
-          <inputType
-          	  id="cdt.managedbuild.tool.gnu.c.compiler.input.cygwin"
-              superClass="cdt.managedbuild.tool.gnu.c.compiler.input"
-          />
-      </tool>      
-      <tool
-          id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin"
-          name="%ToolName.compiler.cygwin.gnu.cpp"
-          superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
-          <envVarBuildPath 
-              pathType="buildpathInclude"
-              variableList="CPATH,CPLUS_INCLUDE_PATH"
-              buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver">
-          </envVarBuildPath>
-          <inputType
-          	  id="cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin"
-              superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"
-          />
-      </tool>      
+            id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin"
+            name="%ToolName.linker.cygwin.gnu.cpp"
+            superClass="cdt.managedbuild.tool.gnu.cpp.linker">
+         <envVarBuildPath
+               pathType="buildpathLibrary"
+               variableList="LIBRARY_PATH"
+               buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver" />
+         <outputType
+               outputs="exe"
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker.output"
+               id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output" />
+         <outputType
+               outputs="dll,a.dll"
+               outputPrefix=""
+               buildVariable="LIBRARIES"
+               id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output.so"
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so" />
 
-	  <builder
-	  	  isAbstract="true"
-	      id="cdt.managedbuild.target.gnu.builder"
-          command="make"
-          arguments=""
-          variableFormat="${=}"
-          isVariableCaseSensitive="true"
-          reservedMacroNames="ROOT,DEPS,OBJS,.*_SRCS,EXECUTABLES,SUBDIRS,LIBS,USER_OBJS,.*_INPUTS,.*_OUTPUTS"
-          buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu2.GnuMakefileGenerator"
-          macroInputFileNameValue="$(notdir $&lt;)"
-          macroInputFileExtValue="$(suffix $(notdir $&lt;))"
-          macroInputFileBaseNameValue="$(basename $(notdir $&lt;))"
-          macroInputFileRelPathValue="$&lt;"
-          macroInputDirRelPathValue="$(dir $&lt;)"
-          macroOutputFileNameValue="$(notdir $@)"
-          macroOutputFileExtValue="$(suffix $(notdir $@))"
-          macroOutputFileBaseNameValue="$(basename $(notdir $@))"
-          macroOutputFileRelPathValue="$@"
-          macroOutputDirRelPathValue="$(dir $@)"
-          autoBuildTarget="all"
-          incrementalBuildTarget="all"
-          cleanBuildTarget="clean"
-          ignoreErrCmd="-k"
-          parallelBuildCmd="-j*"
-          errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser"
-          name="%GNUMakeBuilder.name">
-   	  </builder>   
-   	  
+      </tool>
+      <tool
+            id="cdt.managedbuild.tool.gnu.c.compiler.cygwin"
+            name="%ToolName.compiler.cygwin.gnu.c"
+            superClass="cdt.managedbuild.tool.gnu.c.compiler">
+         <envVarBuildPath
+               pathType="buildpathInclude"
+               variableList="CPATH,C_INCLUDE_PATH"
+               buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver" />
+         <inputType
+               id="cdt.managedbuild.tool.gnu.c.compiler.input.cygwin"
+               superClass="cdt.managedbuild.tool.gnu.c.compiler.input" />
+      </tool>
+      <tool
+            id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin"
+            name="%ToolName.compiler.cygwin.gnu.cpp"
+            superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+         <envVarBuildPath
+               pathType="buildpathInclude"
+               variableList="CPATH,CPLUS_INCLUDE_PATH"
+               buildPathResolver="org.eclipse.cdt.managedbuilder.gnu.cygwin.CygwinPathResolver" />
+         <inputType
+               id="cdt.managedbuild.tool.gnu.cpp.compiler.input.cygwin"
+               superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input" />
+      </tool>
+      <builder
+            isAbstract="true"
+            id="cdt.managedbuild.target.gnu.builder"
+            command="make"
+            arguments=""
+            variableFormat="${=}"
+            isVariableCaseSensitive="true"
+            reservedMacroNames="ROOT,DEPS,OBJS,.*_SRCS,EXECUTABLES,SUBDIRS,LIBS,USER_OBJS,.*_INPUTS,.*_OUTPUTS"
+            buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu2.GnuMakefileGenerator"
+            macroInputFileNameValue="$(notdir $&lt;)"
+            macroInputFileExtValue="$(suffix $(notdir $&lt;))"
+            macroInputFileBaseNameValue="$(basename $(notdir $&lt;))"
+            macroInputFileRelPathValue="$&lt;"
+            macroInputDirRelPathValue="$(dir $&lt;)"
+            macroOutputFileNameValue="$(notdir $@)"
+            macroOutputFileExtValue="$(suffix $(notdir $@))"
+            macroOutputFileBaseNameValue="$(basename $(notdir $@))"
+            macroOutputFileRelPathValue="$@"
+            macroOutputDirRelPathValue="$(dir $@)"
+            autoBuildTarget="all"
+            incrementalBuildTarget="all"
+            cleanBuildTarget="clean"
+            ignoreErrCmd="-k"
+            parallelBuildCmd="-j*"
+            errorParsers="org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser"
+            name="%GNUMakeBuilder.name" />
       <toolChain
             archList="all"
             id="cdt.managedbuild.toolchain.gnu.base"
@@ -2275,439 +2033,385 @@ Contributors:
             name="%ToolChainName.Linux"
             osList="linux,hpux,aix,qnx"
             targetTool="cdt.managedbuild.tool.gnu.c.linker;cdt.managedbuild.tool.gnu.cpp.linker;cdt.managedbuild.tool.gnu.archiver">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.platform.base"
-		              name="%PlatformName.Dbg"
-		              binaryParser="org.eclipse.cdt.core.GNU_ELF"
-		              osList="linux,hpux,aix,qnx"
-		              archList="all">
-	              </targetPlatform>
-				  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder"
-				      id="cdt.managedbuild.target.gnu.builder.base">
-		     	  </builder>    
-			      <tool
-		    		  id="cdt.managedbuild.tool.gnu.archiver.base"
-			          superClass="cdt.managedbuild.tool.gnu.archiver">
-			  <enablement 
-              	type="ALL">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  </enablement>
-				  </tool>                 
-				  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
-         <option
-               category="gnu.cpp.compiler.category.other"
-               command="-pthread"
-               defaultValue="false"
-               id="gnu.cpp.compiler.option.pthread"
-               name="%Option.Pthread"
-               tip="%Option.PthreadCompilerTip"
-               valueType="boolean">
-         </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
-                     <option
-                           category="gnu.c.compiler.category.other"
-                           command="-pthread"
-                           defaultValue="false"
-                           id="gnu.c.compiler.option.pthread"
-                           name="%Option.Pthread"
-                           tip="%Option.PthreadCompilerTip"
-                           valueType="boolean">
-                     </option>
-				  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker">
-                     <option
-                           category="gnu.c.link.category.general"
-                           command="-pthread"
-                           defaultValue="false"
-                           id="gnu.c.link.option.pthread"
-                           name="%Option.Pthread"
-                           tip="%Option.PthreadLinkerTip"
-                           valueType="boolean">
-                     </option>
-             <enablement 
-              	type="ALL">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-                  </tool> 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker">
-                     <option
-                           category="gnu.cpp.link.category.options"
-                           command="-pthread"
-                           defaultValue="false"
-                           id="gnu.cpp.link.option.pthread"
-                           name="%Option.Pthread"
-                           tip="%Option.PthreadLinkerTip"
-                           valueType="boolean">
-                     </option>
-             <enablement 
-              	type="ALL">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-                  </tool> 
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.base"
-					  superClass="cdt.managedbuild.tool.gnu.assembler">
-				  </tool>   
-			  </toolChain>
- 
-              <toolChain
-                    archList="all"
-                    configurationEnvironmentSupplier="org.eclipse.cdt.managedbuilder.gnu.cygwin.GnuCygwinConfigurationEnvironmentSupplier"
-                    id="cdt.managedbuild.toolchain.gnu.cygwin.base"
-                    isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.cygwin.IsGnuCygwinToolChainSupported"
-                    languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorCygwin"
-                    name="%ToolChainName.Cygwin"
-                    osList="win32"
-                    targetTool="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base;cdt.managedbuild.tool.gnu.c.linker.cygwin.base;cdt.managedbuild.tool.gnu.archiver">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.cygwin.base"
-				 	  name="%PlatformName.Dbg"
-                      binaryParser="org.eclipse.cdt.core.Cygwin_PE64"            					  
-					  osList="win32"					  
-					  archList="all">
-				  </targetPlatform>
-				    <builder
-					  superClass="cdt.managedbuild.target.gnu.builder"
-				      id="cdt.managedbuild.target.gnu.builder.cygwin.base">
-		     	  </builder>    
-				  
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.cygwin.base"
-					  superClass="cdt.managedbuild.tool.gnu.assembler">
-				  </tool> 		               		         
-			      <tool
-		    		  id="cdt.managedbuild.tool.gnu.archiver.cygwin.base"
-			          superClass="cdt.managedbuild.tool.gnu.archiver">
-			  <enablement 
-              	type="ALL">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  </enablement>
-				  </tool>                 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin">
-                  </tool>
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin">
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.cygwin.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin">
-               <enablement 
-              	type="ALL">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin">
-               <enablement 
-              	type="ALL">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-                  </tool>                  
-
-               </toolChain>                                   
-   	              
-              <toolChain
-                    archList="all"
-                    configurationEnvironmentSupplier="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwEnvironmentVariableSupplier"
-                    id="cdt.managedbuild.toolchain.gnu.mingw.base"
-                    isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwIsToolChainSupported"
-                    languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW"
-                    name="%ToolChainName.MinGW"
-                    osList="win32"
-                    targetTool="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base;cdt.managedbuild.tool.gnu.c.linker.mingw.base;cdt.managedbuild.tool.gnu.archiver">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.mingw.base"
-				 	  name="%PlatformName.Dbg"
-                      binaryParser="org.eclipse.cdt.core.GNU_PE64"
-					  osList="win32"					  
-					  archList="all">
-				  </targetPlatform>
-                  <builder
-                        id="cdt.managedbuild.tool.gnu.builder.mingw.base"
-                        isAbstract="false"
-                        isVariableCaseSensitive="false"
-                        superClass="org.eclipse.cdt.build.core.internal.builder">
-                  </builder>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.mingw.base"
-					  superClass="cdt.managedbuild.tool.gnu.assembler">
-				  </tool> 		               		         
-			      <tool
-		    		  id="cdt.managedbuild.tool.gnu.archiver.mingw.base"
-			          superClass="cdt.managedbuild.tool.gnu.archiver">
-			  <enablement 
-              	type="ALL">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  </enablement>
-				  </tool>                 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
-                  </tool>
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.mingw.base"
-                      name="%ToolName.linker.mingw.gnu.c"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker">
-               <enablement 
-              	type="ALL">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-			  <outputType
-                   id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.output.base"
-                   superClass="cdt.managedbuild.tool.gnu.c.linker.output.so"
-                   outputs="dll">
-			    </outputType>
-			  
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base"
-                      name="%ToolName.linker.mingw.gnu.cpp"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker">
-               <enablement 
-              	type="ALL">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-			  	<outputType
-                   id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.output.base"
-                   superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so"
-                   outputs="dll">
-			    </outputType>
-                  </tool>                  
-
-               </toolChain>                                   
-
-               <toolChain
-                     archList="all"
-                     id="cdt.managedbuild.toolchain.gnu.macosx.base"
-                     languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
-                     name="%ToolChainName.Macosx"
-                     osList="macosx"
-                     targetTool="cdt.managedbuild.tool.macosx.c.linker.macosx.base;cdt.managedbuild.tool.macosx.cpp.linker.macosx.base;cdt.managedbuild.tool.gnu.archiver">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.macosx.base"
-				 	  name="%PlatformName.Dbg"
-                      binaryParser="org.eclipse.cdt.core.MachO64"
-					  osList="macosx"					  
-					  archList="all">
-				  </targetPlatform>
-				  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder"
-				      id="cdt.managedbuild.target.gnu.builder.macosx.base">
-		     	  </builder>    
-				  
-				  <tool
-				      id="cdt.managedbuild.tool.macosx.c.linker.macosx.base"
-					  superClass="cdt.managedbuild.tool.macosx.c.linker">
-	             <enablement 
-              	type="CMD_USAGE">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-				  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base"
-					  superClass="cdt.managedbuild.tool.macosx.cpp.linker">
-	             <enablement 
-              	type="CMD_USAGE">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-				  </tool>    
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.macosx.base"
-					  superClass="cdt.managedbuild.tool.gnu.assembler">
-				  </tool> 		               		         
-			      <tool
-		    		  id="cdt.managedbuild.tool.gnu.archiver.macosx.base"
-			          superClass="cdt.managedbuild.tool.gnu.archiver">
-			  <enablement 
-              	type="ALL">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  </enablement>
-				  </tool>                 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
-                  </tool>
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.macosx.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
-                  </tool>
-               </toolChain>
-               
-               <!--toolChain
-                     name="%ToolChainName.Solaris"
-                     targetTool="cdt.managedbuild.tool.gnu.solaris.cpp.linker.base;cdt.managedbuild.tool.gnu.solaris.c.linker.base"
-                     archList="all"
-                     osList="solaris"
-                     id="cdt.managedbuild.toolchain.gnu.solaris.base">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.solaris.base"
-		              name="%PlatformName.Dbg"
-		              binaryParser="org.eclipse.cdt.core.ELF"
-		              osList="solaris"
-		              archList="all">
-	              </targetPlatform>
-				  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
-				  </tool>
-				  <tool
-		    		  id="cdt.managedbuild.tool.gnu.solaris.archiver.base"
-			          superClass="cdt.managedbuild.tool.gnu.archiver">
-			  <enablement 
-              	type="ALL">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  </enablement>
-				  </tool>                 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.c.linker.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker">
-             <enablement 
-              	type="ALL">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-                  </tool> 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.cpp.linker.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker">
-             <enablement 
-              	type="ALL">
-              	<not>
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  	</not>
-			  </enablement>
-                  </tool> 
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.solaris.assembler.base"
-					  superClass="cdt.managedbuild.tool.gnu.assembler">
-				  </tool>   
-				  
-			  </toolChain-->
-
-               <toolChain
-                     archList="all"
-                     id="cdt.managedbuild.toolchain.gnu.solaris.base"
-                     languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
-                     name="%ToolChainName.Solaris"
-                     osList="solaris"
-                     superClass="cdt.managedbuild.toolchain.gnu.base">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.solaris.base"
-		              name="%PlatformName.Dbg"
-		              binaryParser="org.eclipse.cdt.core.ELF"
-		              osList="solaris"
-		              archList="all">
-	              </targetPlatform>
-	              <builder
-					  superClass="cdt.managedbuild.target.gnu.builder"
-				      id="cdt.managedbuild.target.gnu.builder.solaris.base">
-		     	  </builder>    
-	              
-				  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base"
-                      name="%ToolName.compiler.solaris.cpp"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.base"
-                      name="%ToolName.compiler.solaris.c"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
-				  </tool>
-			  </toolChain>
-
-         <configuration
-               cleanCommand="rm -rf"
-               id="cdt.managedbuild.config.gnu.base"
-               languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
-		    <enablement type="CONTAINER_ATTRIBUTE" 
-              	attribute="artifactExtension"
-              	value="so"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
-		    <enablement type="CONTAINER_ATTRIBUTE" 
-              	attribute="artifactExtension" 
-              	value="a"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  </enablement>
-		</configuration>
-      
-      <projectType      
-            isAbstract="false"     
+         <targetPlatform
+               id="cdt.managedbuild.target.gnu.platform.base"
+               name="%PlatformName.Dbg"
+               binaryParser="org.eclipse.cdt.core.GNU_ELF"
+               osList="linux,hpux,aix,qnx"
+               archList="all" />
+         <builder
+               superClass="cdt.managedbuild.target.gnu.builder"
+               id="cdt.managedbuild.target.gnu.builder.base" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.archiver.base"
+               superClass="cdt.managedbuild.tool.gnu.archiver">
+            <enablement type="ALL">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.cpp.compiler.base"
+               superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+            <option
+                  category="gnu.cpp.compiler.category.other"
+                  command="-pthread"
+                  defaultValue="false"
+                  id="gnu.cpp.compiler.option.pthread"
+                  name="%Option.Pthread"
+                  tip="%Option.PthreadCompilerTip"
+                  valueType="boolean" />
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.c.compiler.base"
+               superClass="cdt.managedbuild.tool.gnu.c.compiler">
+            <option
+                  category="gnu.c.compiler.category.other"
+                  command="-pthread"
+                  defaultValue="false"
+                  id="gnu.c.compiler.option.pthread"
+                  name="%Option.Pthread"
+                  tip="%Option.PthreadCompilerTip"
+                  valueType="boolean" />
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.c.linker.base"
+               superClass="cdt.managedbuild.tool.gnu.c.linker">
+            <option
+                  category="gnu.c.link.category.general"
+                  command="-pthread"
+                  defaultValue="false"
+                  id="gnu.c.link.option.pthread"
+                  name="%Option.Pthread"
+                  tip="%Option.PthreadLinkerTip"
+                  valueType="boolean" />
+            <enablement type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.cpp.linker.base"
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker">
+            <option
+                  category="gnu.cpp.link.category.options"
+                  command="-pthread"
+                  defaultValue="false"
+                  id="gnu.cpp.link.option.pthread"
+                  name="%Option.Pthread"
+                  tip="%Option.PthreadLinkerTip"
+                  valueType="boolean" />
+            <enablement type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.assembler.base"
+               superClass="cdt.managedbuild.tool.gnu.assembler" />
+      </toolChain>
+      <toolChain
+            archList="all"
+            configurationEnvironmentSupplier="org.eclipse.cdt.managedbuilder.gnu.cygwin.GnuCygwinConfigurationEnvironmentSupplier"
+            id="cdt.managedbuild.toolchain.gnu.cygwin.base"
+            isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.cygwin.IsGnuCygwinToolChainSupported"
+            languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorCygwin"
+            name="%ToolChainName.Cygwin"
+            osList="win32"
+            targetTool="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base;cdt.managedbuild.tool.gnu.c.linker.cygwin.base;cdt.managedbuild.tool.gnu.archiver">
+         <targetPlatform
+               id="cdt.managedbuild.target.gnu.platform.cygwin.base"
+               name="%PlatformName.Dbg"
+               binaryParser="org.eclipse.cdt.core.Cygwin_PE64"
+               osList="win32"
+               archList="all" />
+         <builder
+               superClass="cdt.managedbuild.target.gnu.builder"
+               id="cdt.managedbuild.target.gnu.builder.cygwin.base" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.assembler.cygwin.base"
+               superClass="cdt.managedbuild.tool.gnu.assembler" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.archiver.cygwin.base"
+               superClass="cdt.managedbuild.tool.gnu.archiver">
+            <enablement type="ALL">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base"
+               superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin">
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base"
+               superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.c.linker.cygwin.base"
+               superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin">
+            <enablement type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base"
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin">
+            <enablement type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+         </tool>
+      </toolChain>
+      <toolChain
+            archList="all"
+            configurationEnvironmentSupplier="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwEnvironmentVariableSupplier"
+            id="cdt.managedbuild.toolchain.gnu.mingw.base"
+            isToolChainSupported="org.eclipse.cdt.managedbuilder.gnu.mingw.MingwIsToolChainSupported"
+            languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetectorMinGW"
+            name="%ToolChainName.MinGW"
+            osList="win32"
+            targetTool="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base;cdt.managedbuild.tool.gnu.c.linker.mingw.base;cdt.managedbuild.tool.gnu.archiver">
+         <targetPlatform
+               id="cdt.managedbuild.target.gnu.platform.mingw.base"
+               name="%PlatformName.Dbg"
+               binaryParser="org.eclipse.cdt.core.GNU_PE64"
+               osList="win32"
+               archList="all" />
+         <builder
+               id="cdt.managedbuild.tool.gnu.builder.mingw.base"
+               isAbstract="false"
+               isVariableCaseSensitive="false"
+               superClass="org.eclipse.cdt.build.core.internal.builder" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.assembler.mingw.base"
+               superClass="cdt.managedbuild.tool.gnu.assembler" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.archiver.mingw.base"
+               superClass="cdt.managedbuild.tool.gnu.archiver">
+            <enablement type="ALL">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base"
+               superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base"
+               superClass="cdt.managedbuild.tool.gnu.c.compiler" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.c.linker.mingw.base"
+               name="%ToolName.linker.mingw.gnu.c"
+               superClass="cdt.managedbuild.tool.gnu.c.linker">
+            <enablement type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+            <outputType
+                  id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.output.base"
+                  superClass="cdt.managedbuild.tool.gnu.c.linker.output.so"
+                  outputs="dll">
+            </outputType>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base"
+               name="%ToolName.linker.mingw.gnu.cpp"
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker">
+            <enablement type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+            <outputType
+                  id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.output.base"
+                  superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so"
+                  outputs="dll">
+            </outputType>
+         </tool>
+      </toolChain>
+      <toolChain
+            archList="all"
+            id="cdt.managedbuild.toolchain.gnu.macosx.base"
+            languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
+            name="%ToolChainName.Macosx"
+            osList="macosx"
+            targetTool="cdt.managedbuild.tool.macosx.c.linker.macosx.base;cdt.managedbuild.tool.macosx.cpp.linker.macosx.base;cdt.managedbuild.tool.gnu.archiver">
+         <targetPlatform
+               id="cdt.managedbuild.target.gnu.platform.macosx.base"
+               name="%PlatformName.Dbg"
+               binaryParser="org.eclipse.cdt.core.MachO64"
+               osList="macosx"
+               archList="all" />
+         <builder
+               superClass="cdt.managedbuild.target.gnu.builder"
+               id="cdt.managedbuild.target.gnu.builder.macosx.base" />
+         <tool
+               id="cdt.managedbuild.tool.macosx.c.linker.macosx.base"
+               superClass="cdt.managedbuild.tool.macosx.c.linker">
+            <enablement type="CMD_USAGE">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base"
+               superClass="cdt.managedbuild.tool.macosx.cpp.linker">
+            <enablement type="CMD_USAGE">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.assembler.macosx.base"
+               superClass="cdt.managedbuild.tool.gnu.assembler" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.archiver.macosx.base"
+               superClass="cdt.managedbuild.tool.gnu.archiver">
+            <enablement type="ALL">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base"
+               superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.c.compiler.macosx.base"
+               superClass="cdt.managedbuild.tool.gnu.c.compiler" />
+      </toolChain>
+      <!--toolChain
+            name="%ToolChainName.Solaris"
+            targetTool="cdt.managedbuild.tool.gnu.solaris.cpp.linker.base;cdt.managedbuild.tool.gnu.solaris.c.linker.base"
+            archList="all"
+            osList="solaris"
+            id="cdt.managedbuild.toolchain.gnu.solaris.base">
+         <targetPlatform
+               id="cdt.managedbuild.target.gnu.solaris.base"
+               name="%PlatformName.Dbg"
+               binaryParser="org.eclipse.cdt.core.ELF"
+               osList="solaris"
+               archList="all" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base"
+               superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.solaris.c.compiler.base"
+               superClass="cdt.managedbuild.tool.gnu.c.compiler.base" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.solaris.archiver.base"
+               superClass="cdt.managedbuild.tool.gnu.archiver">
+            <enablement type="ALL">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.solaris.c.linker.base"
+               superClass="cdt.managedbuild.tool.gnu.c.linker">
+            <enablement type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.solaris.cpp.linker.base"
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker">
+            <enablement type="ALL">
+               <not>
+                  <checkBuildProperty
+                        property="org.eclipse.cdt.build.core.buildArtefactType"
+                        value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+               </not>
+            </enablement>
+         </tool>
+         <tool
+               id="cdt.managedbuild.tool.gnu.solaris.assembler.base"
+               superClass="cdt.managedbuild.tool.gnu.assembler" />
+      </toolChain-->
+      <toolChain
+            archList="all"
+            id="cdt.managedbuild.toolchain.gnu.solaris.base"
+            languageSettingsProviders="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser;org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector"
+            name="%ToolChainName.Solaris"
+            osList="solaris"
+            superClass="cdt.managedbuild.toolchain.gnu.base">
+         <targetPlatform
+               id="cdt.managedbuild.target.gnu.solaris.base"
+               name="%PlatformName.Dbg"
+               binaryParser="org.eclipse.cdt.core.ELF"
+               osList="solaris"
+               archList="all" />
+         <builder
+               superClass="cdt.managedbuild.target.gnu.builder"
+               id="cdt.managedbuild.target.gnu.builder.solaris.base" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base"
+               name="%ToolName.compiler.solaris.cpp"
+               superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base" />
+         <tool
+               id="cdt.managedbuild.tool.gnu.solaris.c.compiler.base"
+               name="%ToolName.compiler.solaris.c"
+               superClass="cdt.managedbuild.tool.gnu.c.compiler.base" />
+      </toolChain>
+      <configuration
+            cleanCommand="rm -rf"
+            id="cdt.managedbuild.config.gnu.base"
+            languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
+               value="so"
+               extensionAdjustment="false">
+            <checkBuildProperty
+                  property="org.eclipse.cdt.build.core.buildArtefactType"
+                  value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+         </enablement>
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
+               value="a"
+               extensionAdjustment="false">
+            <checkBuildProperty
+                  property="org.eclipse.cdt.build.core.buildArtefactType"
+                  value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+         </enablement>
+      </configuration>
+      <projectType
+            isAbstract="false"
             isTest="false"
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
             id="cdt.managedbuild.target.gnu.exe">
@@ -2717,114 +2421,97 @@ Contributors:
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
                parent="cdt.managedbuild.config.gnu.base"
                cleanCommand="rm -rf">
-               <toolChain
-               		superClass="cdt.managedbuild.toolchain.gnu.base"
-                     id="cdt.managedbuild.toolchain.gnu.exe.debug">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.platform.exe.debug"
-		              superClass="cdt.managedbuild.target.gnu.platform.base">
-	              </targetPlatform>
-				  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.base"
-				      id="cdt.managedbuild.target.gnu.builder.exe.debug">
-		     	  </builder>               
-				  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">                         
-                    <option
-				          id="gnu.cpp.compiler.exe.debug.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-						  id="gnu.cpp.compiler.exe.debug.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>           
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.base">                          
-			  	      <option
-					      id="gnu.c.compiler.exe.debug.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option   
-					      id="gnu.c.compiler.exe.debug.option.debugging.level"					     
-					      superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-				  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.base">
-                  </tool> 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
-                  </tool> 
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.exe.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.base">
-				  </tool>   
-			  </toolChain>
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.base"
+                  id="cdt.managedbuild.toolchain.gnu.exe.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.exe.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.base"
+                     id="cdt.managedbuild.target.gnu.builder.exe.debug" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+                  <option
+                        id="gnu.cpp.compiler.exe.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.exe.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+                  <option
+                        id="gnu.c.compiler.exe.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.exe.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
                id="cdt.managedbuild.config.gnu.exe.release"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
                parent="cdt.managedbuild.config.gnu.base"
-               cleanCommand="rm -rf">               
-               <toolChain
-               		superClass="cdt.managedbuild.toolchain.gnu.base"
-                     id="cdt.managedbuild.toolchain.gnu.exe.release">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.platform.exe.release"
-		              superClass="cdt.managedbuild.target.gnu.platform.base">		              
-		          </targetPlatform>
-				  <builder
-				  	  superClass="cdt.managedbuild.target.gnu.builder.base"
-				      id="cdt.managedbuild.target.gnu.builder.exe.release">
-				  </builder> 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">                     
-					  <option
-						  id="gnu.cpp.compiler.exe.release.option.optimization.level"
-						  superClass="gnu.cpp.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.cpp.compiler.exe.release.option.debugging.level"
-						  superClass="gnu.cpp.compiler.option.debugging.level">
-					  </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.base">                          
-					  <option
-						  id="gnu.c.compiler.exe.release.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.exe.release.option.debugging.level"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.base">
-                  </tool> 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
-                  </tool>  
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.exe.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.base">
-				  </tool>   
-               </toolChain>
+               cleanCommand="rm -rf">
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.base"
+                  id="cdt.managedbuild.toolchain.gnu.exe.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.exe.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.base"
+                     id="cdt.managedbuild.target.gnu.builder.exe.release" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+                  <option
+                        id="gnu.cpp.compiler.exe.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.exe.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+                  <option
+                        id="gnu.c.compiler.exe.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.exe.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.base" />
+            </toolChain>
          </configuration>
-      </projectType>     
-      
-      <projectType      
-            isAbstract="false"     
+      </projectType>
+      <projectType
+            isAbstract="false"
             isTest="false"
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
             id="cdt.managedbuild.target.gnu.so">
@@ -2832,337 +2519,294 @@ Contributors:
                name="%ConfigName.Dbg"
                cleanCommand="rm -rf"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
-               parent="cdt.managedbuild.config.gnu.base"                                         
+               parent="cdt.managedbuild.config.gnu.base"
                id="cdt.managedbuild.config.gnu.so.debug">
-               <toolChain
-               		 superClass="cdt.managedbuild.toolchain.gnu.base"
-                     id="cdt.managedbuild.toolchain.gnu.so.debug">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.platform.so.debug"
-		              superClass="cdt.managedbuild.target.gnu.platform.base">
-		          </targetPlatform>
-				  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.base"
-				      id="cdt.managedbuild.target.gnu.builder.so.debug">		              
-				  </builder>               		         
-				  <tool
-				      id="cdt.managedbuild.tool.gnu.cpp.compiler.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
-					  <option
-					      id="gnu.cpp.compiler.so.debug.option.optimization.level"
-						  superClass="gnu.cpp.compiler.option.optimization.level">
-					  </option>
-					  <option
-					      id="gnu.cpp.compiler.so.debug.option.debugging.level"
-						  superClass="gnu.cpp.compiler.option.debugging.level">
-					  </option>
-				  </tool>
-				  <tool
-				      id="cdt.managedbuild.tool.gnu.c.compiler.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
-					  <option
-						  id="gnu.c.compiler.so.debug.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-					      id="gnu.c.compiler.so.debug.option.debugging.level"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-				  </tool>
-				  <tool
-				      id="cdt.managedbuild.tool.gnu.c.linker.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.c.linker.base">
-					  <option
-						  id="gnu.c.link.so.debug.option.shared"
-						  superClass="gnu.c.link.option.shared">
-					  </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.gnu.c.linker.output.so"
-			              id="cdt.managedbuild.tool.gnu.c.linker.so.debug.output">
-			          </outputType>
-				  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.cpp.linker.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
-					  <option
-						  id="gnu.cpp.link.so.debug.option.shared"
-						  superClass="gnu.cpp.link.option.shared">
-					  </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so"
-			              id="cdt.managedbuild.tool.gnu.cpp.linker.so.debug.output">
-			          </outputType>
-				  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.base">
-				  </tool>   
-			   </toolChain>
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.base"
+                  id="cdt.managedbuild.toolchain.gnu.so.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.so.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.base"
+                     id="cdt.managedbuild.target.gnu.builder.so.debug" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+                  <option
+                        id="gnu.cpp.compiler.so.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.so.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+                  <option
+                        id="gnu.c.compiler.so.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.so.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.base">
+                  <option
+                        id="gnu.c.link.so.debug.option.shared"
+                        superClass="gnu.c.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.gnu.c.linker.output.so"
+                        id="cdt.managedbuild.tool.gnu.c.linker.so.debug.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+                  <option
+                        id="gnu.cpp.link.so.debug.option.shared"
+                        superClass="gnu.cpp.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so"
+                        id="cdt.managedbuild.tool.gnu.cpp.linker.so.debug.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.base">
+               </tool>
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
                cleanCommand="rm -rf"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
-               parent="cdt.managedbuild.config.gnu.base"               
+               parent="cdt.managedbuild.config.gnu.base"
                id="cdt.managedbuild.config.gnu.so.release">
-               <toolChain
-					 superClass="cdt.managedbuild.toolchain.gnu.base"
-                     id="cdt.managedbuild.toolchain.gnu.so.release">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.platform.so.release"
-		              superClass="cdt.managedbuild.target.gnu.platform.base">
-		          </targetPlatform>
-				  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.base"
-				      id="cdt.managedbuild.target.gnu.builder.so.release">		              
-				  </builder>               
-				  <tool
-				      id="cdt.managedbuild.tool.gnu.cpp.compiler.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
-				      <option
-				          id="gnu.cpp.compiler.so.release.option.optimization.level"
-						  superClass="gnu.cpp.compiler.option.optimization.level">
-				      </option>
-				      <option
-				          id="gnu.cpp.compiler.so.release.option.debugging.level"
-						  superClass="gnu.cpp.compiler.option.debugging.level">
-				      </option>
-				  </tool>				
-				  <tool				     
-				      id="cdt.managedbuild.tool.gnu.c.compiler.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
-				      <option
-				          id="gnu.c.compiler.so.release.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-				      </option>
-				      <option
-				          id="gnu.c.compiler.so.release.option.debugging.level"
-						  superClass="gnu.c.compiler.option.debugging.level">
-				      </option>
-				  </tool>
-				  <tool
-				      id="cdt.managedbuild.tool.gnu.c.linker.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.c.linker.base">
-					  <option
-						  id="gnu.c.link.so.release.option.shared"
-						  superClass="gnu.c.link.option.shared">
-					  </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.gnu.c.linker.output.so"
-			              id="cdt.managedbuild.tool.gnu.c.linker.so.release.output">
-			          </outputType>
-				  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.cpp.linker.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
-					  <option
-						  id="gnu.cpp.link.so.release.option.shared"
-						  superClass="gnu.cpp.link.option.shared">
-					  </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so"
-			              id="cdt.managedbuild.tool.gnu.cpp.linker.so.release.output">
-			          </outputType>
-				  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.base">
-				  </tool>   
-			   </toolChain>  
-         </configuration>         
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.base"
+                  id="cdt.managedbuild.toolchain.gnu.so.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.so.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.base"
+                     id="cdt.managedbuild.target.gnu.builder.so.release" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+                  <option
+                        id="gnu.cpp.compiler.so.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.so.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+                  <option
+                        id="gnu.c.compiler.so.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.so.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.base">
+                  <option
+                        id="gnu.c.link.so.release.option.shared"
+                        superClass="gnu.c.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.gnu.c.linker.output.so"
+                        id="cdt.managedbuild.tool.gnu.c.linker.so.release.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+                  <option
+                        id="gnu.cpp.link.so.release.option.shared"
+                        superClass="gnu.cpp.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.gnu.cpp.linker.output.so"
+                        id="cdt.managedbuild.tool.gnu.cpp.linker.so.release.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.base">
+               </tool>
+            </toolChain>
+         </configuration>
       </projectType>
-          
-      <projectType 
+      <projectType
             isTest="false"
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib"
             isAbstract="false"
-            id="cdt.managedbuild.target.gnu.lib">                        
+            id="cdt.managedbuild.target.gnu.lib">
          <configuration
-			   name="%ConfigName.Dbg"
+               name="%ConfigName.Dbg"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
                parent="cdt.managedbuild.config.gnu.base"
-			   cleanCommand="rm -rf"
-			   id="cdt.managedbuild.config.gnu.lib.debug">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.base"
-                     id="cdt.managedbuild.toolchain.gnu.lib.debug">
-				  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.lib.debug"
-				 	  superClass="cdt.managedbuild.target.gnu.platform.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.base"
-					  id="cdt.managedbuild.target.gnu.builder.lib.debug">		              
-			      </builder>               		         
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.cpp.compiler.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
-					  <option
-					      id="gnu.cpp.compiler.lib.debug.option.optimization.level"
-					      superClass="gnu.cpp.compiler.option.optimization.level">
-					  </option>
-					  <option
-					      id="gnu.cpp.compiler.lib.debug.option.debugging.level"
-					      superClass="gnu.cpp.compiler.option.debugging.level">
-					  </option>
-                  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
-				      <option
-					      id="gnu.c.compiler.lib.debug.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-				      </option>
-				      <option
-						  id="gnu.c.compiler.lib.debug.option.debugging.level"						
-						  superClass="gnu.c.compiler.option.debugging.level">
-				      </option>
-				  </tool>
-			      <tool
-		    		  id="cdt.managedbuild.tool.gnu.archiver.lib.debug"
-			          superClass="cdt.managedbuild.tool.gnu.archiver.base">
-				  </tool>                 
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.base">
-				  </tool>   
-               </toolChain>                 
+               cleanCommand="rm -rf"
+               id="cdt.managedbuild.config.gnu.lib.debug">
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.base"
+                  id="cdt.managedbuild.toolchain.gnu.lib.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.lib.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.base"
+                     id="cdt.managedbuild.target.gnu.builder.lib.debug" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+                  <option
+                        id="gnu.cpp.compiler.lib.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.lib.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+                  <option
+                        id="gnu.c.compiler.lib.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.lib.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.archiver.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.archiver.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
                parent="cdt.managedbuild.config.gnu.base"
                cleanCommand="rm -rf"
-			   id="cdt.managedbuild.config.gnu.lib.release">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.base"
-                     id="cdt.managedbuild.toolchain.gnu.lib.release">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.platform.lib.release"
-		              superClass="cdt.managedbuild.target.gnu.platform.base">
-		          </targetPlatform>
-				  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.base"
-				      id="cdt.managedbuild.target.gnu.builder.lib.release">		              
-				  </builder>               		            
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.cpp.compiler.lib.release"
-					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
-					  <option
-						  id="gnu.cpp.compiler.lib.release.option.optimization.level"
-						  superClass="gnu.cpp.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.cpp.compiler.lib.release.option.debugging.level"
-						  superClass="gnu.cpp.compiler.option.debugging.level">
-					  </option>
-				  </tool>
-		          <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.lib.release"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
-					  <option
-						  id="gnu.c.compiler.lib.release.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.lib.release.option.debugging.level"
-					      superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-				  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.archiver.lib.release"
-				      superClass="cdt.managedbuild.tool.gnu.archiver.base">
-				  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.lib.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.base">
-				  </tool>   
-               </toolChain>				  
-         </configuration>                  
+               id="cdt.managedbuild.config.gnu.lib.release">
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.base"
+                  id="cdt.managedbuild.toolchain.gnu.lib.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.lib.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.base"
+                     id="cdt.managedbuild.target.gnu.builder.lib.release" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+                  <option
+                        id="gnu.cpp.compiler.lib.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.lib.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+                  <option
+                        id="gnu.c.compiler.lib.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.lib.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.archiver.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.archiver.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.base" />
+            </toolChain>
+         </configuration>
       </projectType>
-      
       <configuration
             artifactExtension="exe"
             cleanCommand="rm -rf"
             id="cdt.managedbuild.config.gnu.cygwin.base"
             languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
-         <enablement type="CONTAINER_ATTRIBUTE" 
-               attribute="artifactExtension" 
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
                value="dll"
                extensionAdjustment="false">
-            <checkBuildProperty 
+            <checkBuildProperty
                   property="org.eclipse.cdt.build.core.buildArtefactType"
-                  value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
+                  value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
          </enablement>
-         <enablement type="CONTAINER_ATTRIBUTE" 
-               attribute="artifactExtension" 
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
                value="a"
                extensionAdjustment="false">
-            <checkBuildProperty 
+            <checkBuildProperty
                   property="org.eclipse.cdt.build.core.buildArtefactType"
-                  value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
+                  value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
          </enablement>
       </configuration>
-
-      <projectType 
+      <projectType
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
             id="cdt.managedbuild.target.gnu.cygwin.exe"
             isTest="false"
-            isAbstract="false">                                  
+            isAbstract="false">
          <configuration
                name="%ConfigName.Dbg"
                cleanCommand="rm -rf"
                id="cdt.managedbuild.config.gnu.cygwin.exe.debug"
                parent="cdt.managedbuild.config.gnu.cygwin.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug">
-               <toolChain
-               		 superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
-                     id="cdt.managedbuild.toolchain.gnu.cygwin.exe.debug">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.cygwin.exe.debug"
-					  superClass="cdt.managedbuild.target.gnu.platform.cygwin.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
-					  id="cdt.managedbuild.target.gnu.builder.cygwin.exe.debug">		              
-			      </builder>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
-                      <option
-                          id="gnu.cpp.compiler.cygwin.exe.debug.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-						  id="gnu.cpp.compiler.cygwin.exe.debug.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
-					  <option
-						  id="gnu.c.compiler.cygwin.exe.debug.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.cygwin.exe.debug.option.debugging.level"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.cygwin.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.base">
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base">
-                  </tool>                  
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.cygwin.exe.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base">
-				  </tool>   
-               </toolChain>                                   
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
+                  id="cdt.managedbuild.toolchain.gnu.cygwin.exe.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.cygwin.exe.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.cygwin.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
+                     id="cdt.managedbuild.target.gnu.builder.cygwin.exe.debug" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
+                  <option
+                        id="gnu.cpp.compiler.cygwin.exe.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.cygwin.exe.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
+                  <option
+                        id="gnu.c.compiler.cygwin.exe.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.cygwin.exe.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.cygwin.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.cygwin.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
@@ -3170,261 +2814,224 @@ Contributors:
                id="cdt.managedbuild.config.gnu.cygwin.exe.release"
                parent="cdt.managedbuild.config.gnu.cygwin.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
-                     id="cdt.managedbuild.toolchain.gnu.cygwin.exe.release">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.cygwin.exe.release"
-					  superClass="cdt.managedbuild.target.gnu.platform.cygwin.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
-					  id="cdt.managedbuild.target.gnu.builder.cygwin.exe.release">		              
-			      </builder>               		                       
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
-                      <option
-                          id="gnu.cpp.compiler.cygwin.exe.release.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.cygwin.exe.release.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>                      
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
-                      <option
-                          id="gnu.c.compiler.cygwin.exe.release.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.cygwin.exe.release.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.cygwin.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.base">
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base">
-                  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.cygwin.exe.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base">
-				  </tool>   
-               </toolChain>                                                     
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
+                  id="cdt.managedbuild.toolchain.gnu.cygwin.exe.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.cygwin.exe.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.cygwin.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
+                     id="cdt.managedbuild.target.gnu.builder.cygwin.exe.release" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
+                  <option
+                        id="gnu.cpp.compiler.cygwin.exe.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.cygwin.exe.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
+                  <option
+                        id="gnu.c.compiler.cygwin.exe.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.cygwin.exe.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.cygwin.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.cygwin.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base" />
+            </toolChain>
          </configuration>
-      </projectType>              
-         
-      <projectType                  
+      </projectType>
+      <projectType
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
             id="cdt.managedbuild.target.gnu.cygwin.so"
             isAbstract="false"
-            isTest="false">            
+            isTest="false">
          <configuration
                name="%ConfigName.Dbg"
                cleanCommand="rm -rf"
                parent="cdt.managedbuild.config.gnu.cygwin.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
                id="cdt.managedbuild.config.gnu.cygwin.so.debug">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
-                     id="cdt.managedbuild.toolchain.gnu.cygwin.so.debug">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.cygwin.so.debug"
-					  superClass="cdt.managedbuild.target.gnu.platform.cygwin.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
-					  id="cdt.managedbuild.target.gnu.builder.cygwin.so.debug">		              
-			      </builder>               		         
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
-                      <option
-                          id="gnu.cpp.compiler.cygwin.so.debug.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.cygwin.so.debug.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
-					  <option
-						  id="gnu.c.compiler.cygwin.so.debug.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.cygwin.so.debug.option.debugging.level"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.cygwin.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.base">
-                      <option
-                          id="gnu.c.link.cygwin.so.debug.option.shared"
-                          superClass="gnu.c.link.option.shared">
-                      </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.output.so"
-			              id="cdt.managedbuild.tool.gnu.c.linker.cygwin.so.debug.output">
-			          </outputType>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base">
-                      <option
-                          id="gnu.cpp.link.cygwin.so.debug.option.shared"
-                          superClass="gnu.cpp.link.option.shared">
-                      </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output.so"
-			              id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.so.debug.output">
-			          </outputType>
-                  </tool>                  
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.cygwin.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base">
-				  </tool>   
-               </toolChain>                                                     
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
+                  id="cdt.managedbuild.toolchain.gnu.cygwin.so.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.cygwin.so.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.cygwin.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
+                     id="cdt.managedbuild.target.gnu.builder.cygwin.so.debug" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
+                  <option
+                        id="gnu.cpp.compiler.cygwin.so.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.cygwin.so.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
+                  <option
+                        id="gnu.c.compiler.cygwin.so.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.cygwin.so.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.cygwin.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.base">
+                  <option
+                        id="gnu.c.link.cygwin.so.debug.option.shared"
+                        superClass="gnu.c.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.output.so"
+                        id="cdt.managedbuild.tool.gnu.c.linker.cygwin.so.debug.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base">
+                  <option
+                        id="gnu.cpp.link.cygwin.so.debug.option.shared"
+                        superClass="gnu.cpp.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output.so"
+                        id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.so.debug.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.cygwin.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base">
+               </tool>
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
                cleanCommand="rm -rf"
                parent="cdt.managedbuild.config.gnu.cygwin.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
-               id="cdt.managedbuild.config.gnu.cygwin.so.release">               
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
-                     id="cdt.managedbuild.toolchain.gnu.cygwin.so.release">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.cygwin.so.release"
-					  superClass="cdt.managedbuild.target.gnu.platform.cygwin.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
-					  id="cdt.managedbuild.target.gnu.builder.cygwin.so.release">		              
-			      </builder>               		                                       
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
-                      <option
-                          id="gnu.cpp.compiler.cygwin.so.release.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.cygwin.so.release.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
-                      <option 
-                          id="gnu.c.compiler.cygwin.so.release.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.cygwin.so.release.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.cygwin.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.base">
-                      <option
-                          id="gnu.c.link.cygwin.so.release.option.shared"
-                          superClass="gnu.c.link.option.shared">
-                      </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.output.so"
-			              id="cdt.managedbuild.tool.gnu.c.linker.cygwin.so.release.output">
-			          </outputType>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base">
-                      <option
-                          id="gnu.cpp.link.cygwin.so.release.option.shared"
-                          superClass="gnu.cpp.link.option.shared">
-                      </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output.so"
-			              id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.so.release.output">
-			          </outputType>
-                  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.cygwin.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base">
-				  </tool>   
-               </toolChain>                                                                                
+               id="cdt.managedbuild.config.gnu.cygwin.so.release">
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
+                  id="cdt.managedbuild.toolchain.gnu.cygwin.so.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.cygwin.so.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.cygwin.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
+                     id="cdt.managedbuild.target.gnu.builder.cygwin.so.release" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
+                  <option
+                        id="gnu.cpp.compiler.cygwin.so.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.cygwin.so.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
+                  <option
+                        id="gnu.c.compiler.cygwin.so.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.cygwin.so.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.cygwin.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.base">
+                  <option
+                        id="gnu.c.link.cygwin.so.release.option.shared"
+                        superClass="gnu.c.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.gnu.c.linker.cygwin.output.so"
+                        id="cdt.managedbuild.tool.gnu.c.linker.cygwin.so.release.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.base">
+                  <option
+                        id="gnu.cpp.link.cygwin.so.release.option.shared"
+                        superClass="gnu.cpp.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.output.so"
+                        id="cdt.managedbuild.tool.gnu.cpp.linker.cygwin.so.release.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.cygwin.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base">
+               </tool>
+            </toolChain>
          </configuration>
       </projectType>
-                       
-      <projectType 
+      <projectType
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib"
             id="cdt.managedbuild.target.gnu.cygwin.lib"
             isTest="false"
-            isAbstract="false">            
+            isAbstract="false">
          <configuration
                name="%ConfigName.Dbg"
                parent="cdt.managedbuild.config.gnu.cygwin.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
                cleanCommand="rm -rf"
                id="cdt.managedbuild.config.gnu.cygwin.lib.debug">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
-                     id="cdt.managedbuild.toolchain.gnu.cygwin.lib.debug">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.cygwin.lib.debug"
-				 	  superClass="cdt.managedbuild.target.gnu.platform.cygwin.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
-					  id="cdt.managedbuild.target.gnu.builder.cygwin.lib.debug">		              
-			      </builder>               		                                                              
-			      <tool
-			          id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
-					  <option
-					      id="gnu.cpp.compiler.cygwin.lib.debug.option.optimization.level"
-					      superClass="gnu.cpp.compiler.option.optimization.level">
-					  </option>
-					  <option
-					        id="gnu.cpp.compiler.cygwin.lib.debug.option.debugging.level"
-							superClass="gnu.cpp.compiler.option.debugging.level">
-					  </option>
-				  </tool>  
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
-                      <option
-                          id="gnu.c.compiler.cygwin.lib.debug.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.cygwin.lib.debug.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.archiver.cygwin.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.archiver.cygwin.base">
-                  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.cygwin.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base">
-				  </tool>   
-               </toolChain>                                                                                				               				  
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
+                  id="cdt.managedbuild.toolchain.gnu.cygwin.lib.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.cygwin.lib.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.cygwin.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
+                     id="cdt.managedbuild.target.gnu.builder.cygwin.lib.debug" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
+                  <option
+                        id="gnu.cpp.compiler.cygwin.lib.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.cygwin.lib.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
+                  <option
+                        id="gnu.c.compiler.cygwin.lib.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.cygwin.lib.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.archiver.cygwin.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.archiver.cygwin.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.cygwin.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
@@ -3432,132 +3039,117 @@ Contributors:
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
                cleanCommand="rm -rf"
                id="cdt.managedbuild.config.gnu.cygwin.lib.release">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
-                     id="cdt.managedbuild.toolchain.gnu.cygwin.lib.release">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.cygwin.lib.release"
-					  superClass="cdt.managedbuild.target.gnu.platform.cygwin.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
-					  id="cdt.managedbuild.target.gnu.builder.cygwin.lib.release">		              
-			      </builder>               		                                                                                              
-                  <tool
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.cygwin.base"
+                  id="cdt.managedbuild.toolchain.gnu.cygwin.lib.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.cygwin.lib.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.cygwin.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.cygwin.base"
+                     id="cdt.managedbuild.target.gnu.builder.cygwin.lib.release" />
+               <tool
                      id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.lib.release"
                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.base">
-                     <option       
-                         id="gnu.cpp.compiler.cygwin.lib.release.option.optimization.level"         
-                         superClass="gnu.cpp.compiler.option.optimization.level">
-                     </option>
-                     <option
-                         id="gnu.cpp.compiler.cygwin.lib.release.option.debugging.level"
-                         superClass="gnu.cpp.compiler.option.debugging.level">
-                     </option>
-                 </tool>
-                  <tool
+                  <option
+                        id="gnu.cpp.compiler.cygwin.lib.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.cygwin.lib.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
                      id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.lib.release"
                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin.base">
-                     <option
-                         id="gnu.c.compiler.cygwin.lib.release.option.optimization.level"
-                         superClass="gnu.c.compiler.option.optimization.level">
-                     </option>
-                     <option
-                         id="gnu.c.compiler.cygwin.lib.release.option.debugging.level"                        
-                         superClass="gnu.c.compiler.option.debugging.level">                         
-                     </option>
-                  </tool>
-                 <tool
+                  <option
+                        id="gnu.c.compiler.cygwin.lib.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.cygwin.lib.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
                      id="cdt.managedbuild.tool.gnu.archiver.cygwin.lib.release"
                      superClass="cdt.managedbuild.tool.gnu.archiver.cygwin.base">
-                 </tool>
-				 <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.cygwin.lib.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base">
-				 </tool>   
-              </toolChain>                                                                                				                    
-         </configuration>         
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.cygwin.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.cygwin.base" />
+            </toolChain>
+         </configuration>
       </projectType>
-      
       <configuration
             artifactExtension="exe"
             cleanCommand="rm -rf"
             id="cdt.managedbuild.config.gnu.mingw.base"
             languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
-		    <enablement type="CONTAINER_ATTRIBUTE" 
-              	attribute="artifactExtension" 
-              	value="dll"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
-		    <enablement type="CONTAINER_ATTRIBUTE" 
-              	attribute="artifactExtension" 
-              	value="a"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  </enablement>
-		</configuration>
-
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
+               value="dll"
+               extensionAdjustment="false">
+            <checkBuildProperty
+                  property="org.eclipse.cdt.build.core.buildArtefactType"
+                  value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+         </enablement>
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
+               value="a"
+               extensionAdjustment="false">
+            <checkBuildProperty
+                  property="org.eclipse.cdt.build.core.buildArtefactType"
+                  value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+         </enablement>
+      </configuration>
       <projectType
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
             id="cdt.managedbuild.target.gnu.mingw.exe"
             isAbstract="false"
-            isTest="false"
-            >                                  
+            isTest="false">
          <configuration
                name="%ConfigName.Dbg"
                cleanCommand="rm -rf"
                id="cdt.managedbuild.config.gnu.mingw.exe.debug"
                parent="cdt.managedbuild.config.gnu.mingw.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug">
-               <toolChain
-               		 superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
-                     id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"
-					  superClass="cdt.managedbuild.target.gnu.platform.mingw.base">
-				  </targetPlatform>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-                      <option
-                          id="gnu.cpp.compiler.mingw.exe.debug.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-						  id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-					  <option
-						  id="gnu.c.compiler.mingw.exe.debug.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.mingw.exe.debug.option.debugging.level"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
-                  </tool>                  
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-				  </tool>   
-               </toolChain>                                   
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
+                  id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.mingw.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
+                  <option
+                        id="gnu.cpp.compiler.mingw.exe.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
+                  <option
+                        id="gnu.c.compiler.mingw.exe.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.mingw.exe.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
@@ -3565,247 +3157,212 @@ Contributors:
                id="cdt.managedbuild.config.gnu.mingw.exe.release"
                parent="cdt.managedbuild.config.gnu.mingw.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
-                     id="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.mingw.exe.release"
-					  superClass="cdt.managedbuild.target.gnu.platform.mingw.base">
-				  </targetPlatform>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-                      <option
-                          id="gnu.cpp.compiler.mingw.exe.release.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.mingw.exe.release.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>                      
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-                      <option
-                          id="gnu.c.compiler.mingw.exe.release.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.mingw.exe.release.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
-                  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-				  </tool>   
-               </toolChain>                                                     
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
+                  id="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.mingw.exe.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.mingw.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
+                  <option
+                        id="gnu.cpp.compiler.mingw.exe.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.mingw.exe.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
+                  <option
+                        id="gnu.c.compiler.mingw.exe.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.mingw.exe.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base" />
+            </toolChain>
          </configuration>
-      </projectType>              
-         
+      </projectType>
       <projectType
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
             id="cdt.managedbuild.target.gnu.mingw.so"
             isAbstract="false"
-            isTest="false"
-            >            
+            isTest="false">
          <configuration
                name="%ConfigName.Dbg"
                cleanCommand="rm -rf"
                parent="cdt.managedbuild.config.gnu.mingw.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
                id="cdt.managedbuild.config.gnu.mingw.so.debug">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
-                     id="cdt.managedbuild.toolchain.gnu.mingw.so.debug">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.mingw.so.debug"
-					  superClass="cdt.managedbuild.target.gnu.platform.mingw.base">
-				  </targetPlatform>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-                      <option
-                          id="gnu.cpp.compiler.mingw.so.debug.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.mingw.so.debug.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.mingw.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-					  <option
-						  id="gnu.c.compiler.mingw.so.debug.option.optimization.level"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.mingw.so.debug.option.debugging.level"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
-                      <option
-                          id="gnu.c.link.mingw.so.debug.option.shared"
-                          superClass="gnu.c.link.option.shared">
-                      </option>
-			          <outputType
-                   id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug.output"
-                   superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.output.base">
-			          </outputType>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
-                      <option
-                          id="gnu.cpp.link.mingw.so.debug.option.shared"
-                          superClass="gnu.cpp.link.option.shared">
-                      </option>
-			          <outputType
-                   id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.debug.output"
-                   superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.output.base">
-			          </outputType>
-                  </tool>                  
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.mingw.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-				  </tool>   
-               </toolChain>                                                     
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
+                  id="cdt.managedbuild.toolchain.gnu.mingw.so.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.mingw.so.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.mingw.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
+                  <option
+                        id="gnu.cpp.compiler.mingw.so.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.mingw.so.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.mingw.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
+                  <option
+                        id="gnu.c.compiler.mingw.so.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.mingw.so.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
+                  <option
+                        id="gnu.c.link.mingw.so.debug.option.shared"
+                        superClass="gnu.c.link.option.shared" />
+                  <outputType
+                        id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.debug.output"
+                        superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.output.base" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
+                  <option
+                        id="gnu.cpp.link.mingw.so.debug.option.shared"
+                        superClass="gnu.cpp.link.option.shared" />
+                  <outputType
+                        id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.debug.output"
+                        superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.output.base" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.mingw.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
+               </tool>
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
                cleanCommand="rm -rf"
                parent="cdt.managedbuild.config.gnu.mingw.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
-               id="cdt.managedbuild.config.gnu.mingw.so.release">               
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
-                     id="cdt.managedbuild.toolchain.gnu.mingw.so.release">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.mingw.so.release"
-					  superClass="cdt.managedbuild.target.gnu.platform.mingw.base">
-				  </targetPlatform>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-                      <option
-                          id="gnu.cpp.compiler.mingw.so.release.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.mingw.so.release.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.mingw.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-                      <option 
-                          id="gnu.c.compiler.mingw.so.release.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.mingw.so.release.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
-                      <option
-                          id="gnu.c.link.mingw.so.release.option.shared"
-                          superClass="gnu.c.link.option.shared">
-                      </option>
-			          <outputType
-                   id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release.output"
-                   superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.output.base">
-			          </outputType>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
-                      <option
-                          id="gnu.cpp.link.mingw.so.release.option.shared"
-                          superClass="gnu.cpp.link.option.shared">
-                      </option>
-			          <outputType
-                   id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.release.output"
-                   superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.output.base">
-			          </outputType>
-                  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.mingw.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-				  </tool>   
-               </toolChain>                                                                                
+               id="cdt.managedbuild.config.gnu.mingw.so.release">
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
+                  id="cdt.managedbuild.toolchain.gnu.mingw.so.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.mingw.so.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.mingw.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
+                  <option
+                        id="gnu.cpp.compiler.mingw.so.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.mingw.so.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.mingw.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
+                  <option
+                        id="gnu.c.compiler.mingw.so.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.mingw.so.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base">
+                  <option
+                        id="gnu.c.link.mingw.so.release.option.shared"
+                        superClass="gnu.c.link.option.shared" />
+                  <outputType
+                        id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release.output"
+                        superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.output.base" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.base">
+                  <option
+                        id="gnu.cpp.link.mingw.so.release.option.shared"
+                        superClass="gnu.cpp.link.option.shared" />
+                  <outputType
+                        id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.release.output"
+                        superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.so.output.base" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.mingw.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
+               </tool>
+            </toolChain>
          </configuration>
       </projectType>
-                       
       <projectType
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib"
             id="cdt.managedbuild.target.gnu.mingw.lib"
             isAbstract="false"
-            isTest="false"
-            >            
+            isTest="false">
          <configuration
                name="%ConfigName.Dbg"
                parent="cdt.managedbuild.config.gnu.mingw.base"
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
                cleanCommand="rm -rf"
                id="cdt.managedbuild.config.gnu.mingw.lib.debug">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
-                     id="cdt.managedbuild.toolchain.gnu.mingw.lib.debug">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.mingw.lib.debug"
-				 	  superClass="cdt.managedbuild.target.gnu.platform.mingw.base">
-				  </targetPlatform>
-			      <tool
-			          id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-					  <option
-					      id="gnu.cpp.compiler.mingw.lib.debug.option.optimization.level"
-					      superClass="gnu.cpp.compiler.option.optimization.level">
-					  </option>
-					  <option
-					        id="gnu.cpp.compiler.mingw.lib.debug.option.debugging.level"
-							superClass="gnu.cpp.compiler.option.debugging.level">
-					  </option>
-				  </tool>  
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.mingw.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-                      <option
-                          id="gnu.c.compiler.mingw.lib.debug.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.mingw.lib.debug.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.archiver.mingw.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base">
-                  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.mingw.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-				  </tool>   
-               </toolChain>                                                                                				               				  
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
+                  id="cdt.managedbuild.toolchain.gnu.mingw.lib.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.mingw.lib.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.mingw.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
+                  <option
+                        id="gnu.cpp.compiler.mingw.lib.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.mingw.lib.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.mingw.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
+                  <option
+                        id="gnu.c.compiler.mingw.lib.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.mingw.lib.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.archiver.mingw.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.mingw.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
@@ -3813,72 +3370,66 @@ Contributors:
                buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
                cleanCommand="rm -rf"
                id="cdt.managedbuild.config.gnu.mingw.lib.release">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
-                     id="cdt.managedbuild.toolchain.gnu.mingw.lib.release">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.mingw.lib.release"
-					  superClass="cdt.managedbuild.target.gnu.platform.mingw.base">
-				  </targetPlatform>
-                  <tool
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.mingw.base"
+                  id="cdt.managedbuild.toolchain.gnu.mingw.lib.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.mingw.lib.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.mingw.base" />
+               <tool
                      id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.lib.release"
                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base">
-                     <option       
-                         id="gnu.cpp.compiler.mingw.lib.release.option.optimization.level"         
-                         superClass="gnu.cpp.compiler.option.optimization.level">
-                     </option>
-                     <option
-                         id="gnu.cpp.compiler.mingw.lib.release.option.debugging.level"
-                         superClass="gnu.cpp.compiler.option.debugging.level">
-                     </option>
-                 </tool>
-                  <tool
+                  <option
+                        id="gnu.cpp.compiler.mingw.lib.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.mingw.lib.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
                      id="cdt.managedbuild.tool.gnu.c.compiler.mingw.lib.release"
                      superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
-                     <option
-                         id="gnu.c.compiler.mingw.lib.release.option.optimization.level"
-                         superClass="gnu.c.compiler.option.optimization.level">
-                     </option>
-                     <option
-                         id="gnu.c.compiler.mingw.lib.release.option.debugging.level"                        
-                         superClass="gnu.c.compiler.option.debugging.level">                         
-                     </option>
-                  </tool>
-                 <tool
+                  <option
+                        id="gnu.c.compiler.mingw.lib.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.mingw.lib.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
                      id="cdt.managedbuild.tool.gnu.archiver.mingw.lib.release"
                      superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base">
-                 </tool>
-				 <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.mingw.lib.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base">
-				 </tool>   
-              </toolChain>                                                                                				                    
-         </configuration>         
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.mingw.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.mingw.base" />
+            </toolChain>
+         </configuration>
       </projectType>
-
-            <configuration
-                  cleanCommand="rm -rf"
-                  id="cdt.managedbuild.config.gnu.macosx.base"
-                  languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
-		    <enablement type="CONTAINER_ATTRIBUTE" 
-              	attribute="artifactExtension" 
-              	value="dylib"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
-		    <enablement type="CONTAINER_ATTRIBUTE" 
-              	attribute="artifactExtension" 
-              	value="a"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  </enablement>
-		</configuration>
-      
-      <projectType 
+      <configuration
+            cleanCommand="rm -rf"
+            id="cdt.managedbuild.config.gnu.macosx.base"
+            languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
+               value="dylib"
+               extensionAdjustment="false">
+            <checkBuildProperty
+                  property="org.eclipse.cdt.build.core.buildArtefactType"
+                  value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+         </enablement>
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
+               value="a"
+               extensionAdjustment="false">
+            <checkBuildProperty
+                  property="org.eclipse.cdt.build.core.buildArtefactType"
+                  value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+         </enablement>
+      </configuration>
+      <projectType
             id="cdt.managedbuild.target.macosx.exe"
             isTest="false"
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
@@ -3886,627 +3437,540 @@ Contributors:
          <configuration
                name="%ConfigName.Dbg"
                cleanCommand="rm -rf"
-            buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
-			   parent="cdt.managedbuild.config.gnu.macosx.base"               
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
+               parent="cdt.managedbuild.config.gnu.macosx.base"
                id="cdt.managedbuild.config.gnu.macosx.exe.debug">
-               <toolChain
-                     superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
-                     id="cdt.managedbuild.toolchain.gnu.macosx.exe.debug">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.macosx.exe.debug"
-					  superClass="cdt.managedbuild.target.gnu.platform.macosx.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
-					  id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug">		              
-			      </builder>               		         
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
-                      <option
-                          id="gnu.cpp.compilermacosx.exe.debug.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.macosx.exe.debug.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
-                      <option
-                          id="gnu.c.compiler.macosx.exe.debug.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.exe.debug.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-				  <tool
-				      id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug"
-					  superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base">
-				  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.debug"
-					  superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base">
-				  </tool>                                     
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.macosx.exe.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
-				  </tool>   
-               </toolChain>                    
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
+                  id="cdt.managedbuild.toolchain.gnu.macosx.exe.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.macosx.exe.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.macosx.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
+                     id="cdt.managedbuild.target.gnu.builder.macosx.exe.debug" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
+                  <option
+                        id="gnu.cpp.compilermacosx.exe.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.macosx.exe.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
+                  <option
+                        id="gnu.c.compiler.macosx.exe.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.macosx.exe.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug"
+                     superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.debug"
+                     superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.macosx.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
-            buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
-               cleanCommand="rm -rf"               
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
+               cleanCommand="rm -rf"
                id="cdt.managedbuild.config.macosx.exe.release"
-               parent="cdt.managedbuild.config.gnu.macosx.base"       >
-               <toolChain
-                     id="cdt.managedbuild.toolchain.gnu.macosx.exe.release"
-                     superClass="cdt.managedbuild.toolchain.gnu.macosx.base">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.macosx.exe.release"
-				 	  superClass="cdt.managedbuild.target.gnu.platform.macosx.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
-					  id="cdt.managedbuild.target.gnu.builder.macosx.exe.release">		              
-			      </builder>               		         
-                   <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
-                      <option
-                          id="gnu.cpp.compiler.macosx.exe.release.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.macosx.exe.release.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                   </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
-                      <option
-                          id="gnu.c.compiler.macosx.exe.release.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.exe.release.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                   </tool>
-				   <tool
-				       id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.release"
-					   superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base">
-					</tool>
-					<tool
-					    id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.release"
-						superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base">
-					</tool>                   
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.macosx.exe.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
-				  </tool>   
-               </toolChain>                             
+               parent="cdt.managedbuild.config.gnu.macosx.base">
+            <toolChain
+                  id="cdt.managedbuild.toolchain.gnu.macosx.exe.release"
+                  superClass="cdt.managedbuild.toolchain.gnu.macosx.base">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.macosx.exe.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.macosx.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
+                     id="cdt.managedbuild.target.gnu.builder.macosx.exe.release" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
+                  <option
+                        id="gnu.cpp.compiler.macosx.exe.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.macosx.exe.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
+                  <option
+                        id="gnu.c.compiler.macosx.exe.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.macosx.exe.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.release"
+                     superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.exe.release"
+                     superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.macosx.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base" />
+            </toolChain>
          </configuration>
-       </projectType>      
-            
-      <projectType             
+      </projectType>
+      <projectType
             id="cdt.managedbuild.target.macosx.so"
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
             isTest="false"
-            isAbstract="false">            
+            isAbstract="false">
          <configuration
                name="%ConfigName.Dbg"
                cleanCommand="rm -rf"
-			   parent="cdt.managedbuild.config.gnu.macosx.base"                                     
-             buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
+               parent="cdt.managedbuild.config.gnu.macosx.base"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
                id="cdt.managedbuild.config.macosx.so.debug">
-               <toolChain
-               		  superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
-                      id="cdt.managedbuild.toolchain.gnu.macosx.so.debug">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.macosx.so.debug"
-					  superClass="cdt.managedbuild.target.gnu.platform.macosx.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
-					  id="cdt.managedbuild.target.gnu.builder.macosx.so.debug">		              
-			      </builder>               		                       
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
-					  <option
-						  id="gnu.cpp.compiler.macosx.so.debug.option.optimization.level"
-						  superClass="gnu.cpp.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.cpp.compiler.macosx.so.debug.option.debugging.level"
-						  superClass="gnu.cpp.compiler.option.debugging.level">
-					  </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
-                      <option
-                          id="gnu.c.compiler.macosx.so.debug.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.so.debug.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-				  <tool
-				      id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.debug"
-					  superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base">
-					  <option
-					      id="macosx.c.link.macosx.so.debug.option.shared"
-						  superClass="macosx.c.link.option.shared">
-					  </option>
-					  <option
-					      id="macosx.c.link.macosx.so.debug.option.nostart"
-            			  superClass="macosx.c.link.option.nostart">
-            		  </option>
-					  <option
-					      id="macosx.c.link.macosx.so.debug.option.nodeflibs"
-						  superClass="macosx.c.link.option.nodeflibs">
-					  </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.macosx.c.linker.output.so"
-			              id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.debug.output">
-			          </outputType>
-				  </tool>
-				  <tool
-				      id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.so.debug"
-					  superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base">
-					  <option
-					      id="macosx.cpp.link.macosx.so.debug.option.shared"
-						  superClass="macosx.cpp.link.option.shared">
-					  </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.macosx.cpp.linker.output.so"
-			              id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.so.debug.output">
-			          </outputType>
-				  </tool>                                  
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.macosx.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
-				  </tool>   
-               </toolChain>                                                                       
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
+                  id="cdt.managedbuild.toolchain.gnu.macosx.so.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.macosx.so.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.macosx.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
+                     id="cdt.managedbuild.target.gnu.builder.macosx.so.debug" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
+                  <option
+                        id="gnu.cpp.compiler.macosx.so.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.macosx.so.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.macosx.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
+                  <option
+                        id="gnu.c.compiler.macosx.so.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.macosx.so.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.debug"
+                     superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base">
+                  <option
+                        id="macosx.c.link.macosx.so.debug.option.shared"
+                        superClass="macosx.c.link.option.shared" />
+                  <option
+                        id="macosx.c.link.macosx.so.debug.option.nostart"
+                        superClass="macosx.c.link.option.nostart" />
+                  <option
+                        id="macosx.c.link.macosx.so.debug.option.nodeflibs"
+                        superClass="macosx.c.link.option.nodeflibs" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.macosx.c.linker.output.so"
+                        id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.debug.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.so.debug"
+                     superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base">
+                  <option
+                        id="macosx.cpp.link.macosx.so.debug.option.shared"
+                        superClass="macosx.cpp.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.macosx.cpp.linker.output.so"
+                        id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.so.debug.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.macosx.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
+               </tool>
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
-               parent="cdt.managedbuild.config.gnu.macosx.base"       
+               parent="cdt.managedbuild.config.gnu.macosx.base"
                cleanCommand="rm -rf"
-            buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
                id="cdt.managedbuild.config.macosx.so.release">
-               <toolChain
-					 superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
-                     id="cdt.managedbuild.toolchain.gnu.macosx.so.release">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.macosx.so.release"
-					  superClass="cdt.managedbuild.target.gnu.platform.macosx.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
-					  id="cdt.managedbuild.target.gnu.builder.macosx.so.release">		              
-			      </builder>               		                                                     
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
-                      <option
-                          id="gnu.cpp.compiler.macosx.so.release.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.macosx.so.release.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
-                      <option
-                          id="gnu.c.compiler.macosx.so.release.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.so.release.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-				  <tool
-				      id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.release"
-					  superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base">
-					  <option
-					      id="macosx.c.link.macosx.so.release.option.shared"
-						  superClass="macosx.c.link.option.shared">
-					  </option>
-					  <option
-					      id="macosx.c.link.macosx.so.release.option.nostart"
-            			  superClass="macosx.c.link.option.nostart">
-            		  </option>
-					  <option
-					      id="macosx.c.link.macosx.so.release.option.nodeflibs"
-						  superClass="macosx.c.link.option.nodeflibs">
-					  </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.macosx.c.linker.output.so"
-			              id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.release.output">
-			          </outputType>
-				  </tool>
-				  <tool
-				      id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.so.release"
-					  superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base">
-					  <option
-					      id="macosx.cpp.link.macosx.so.release.option.shared"
-						  superClass="macosx.cpp.link.option.shared">
-					  </option>
-			          <outputType
-			              superClass="cdt.managedbuild.tool.macosx.cpp.linker.output.so"
-			              id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.so.release.output">
-			          </outputType>
-				  </tool>                
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.macosx.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
-				  </tool>   
-              </toolChain>                 
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
+                  id="cdt.managedbuild.toolchain.gnu.macosx.so.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.macosx.so.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.macosx.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
+                     id="cdt.managedbuild.target.gnu.builder.macosx.so.release" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
+                  <option
+                        id="gnu.cpp.compiler.macosx.so.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.macosx.so.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.macosx.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
+                  <option
+                        id="gnu.c.compiler.macosx.so.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.macosx.so.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.release"
+                     superClass="cdt.managedbuild.tool.macosx.c.linker.macosx.base">
+                  <option
+                        id="macosx.c.link.macosx.so.release.option.shared"
+                        superClass="macosx.c.link.option.shared" />
+                  <option
+                        id="macosx.c.link.macosx.so.release.option.nostart"
+                        superClass="macosx.c.link.option.nostart" />
+                  <option
+                        id="macosx.c.link.macosx.so.release.option.nodeflibs"
+                        superClass="macosx.c.link.option.nodeflibs" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.macosx.c.linker.output.so"
+                        id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.release.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.so.release"
+                     superClass="cdt.managedbuild.tool.macosx.cpp.linker.macosx.base">
+                  <option
+                        id="macosx.cpp.link.macosx.so.release.option.shared"
+                        superClass="macosx.cpp.link.option.shared" />
+                  <outputType
+                        superClass="cdt.managedbuild.tool.macosx.cpp.linker.output.so"
+                        id="cdt.managedbuild.tool.macosx.cpp.linker.macosx.so.release.output" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.macosx.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
+               </tool>
+            </toolChain>
          </configuration>
       </projectType>
-      
-      <projectType            
+      <projectType
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib"
             id="cdt.managedbuild.target.macosx.lib"
             isTest="false"
-			isAbstract="false">
+            isAbstract="false">
          <configuration
                name="%ConfigName.Dbg"
-               parent="cdt.managedbuild.config.gnu.macosx.base"       
-            buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
+               parent="cdt.managedbuild.config.gnu.macosx.base"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
                cleanCommand="rm -rf"
                id="cdt.managedbuild.config.macosx.lib.debug">
-               <toolChain
-					 superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
-                     id="cdt.managedbuild.toolchain.gnu.macosx.lib.debug">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.macosx.lib.debug"
-					  superClass="cdt.managedbuild.target.gnu.platform.macosx.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
-					  id="cdt.managedbuild.target.gnu.builder.macosx.lib.debug">		              
-			      </builder>               		         
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
-                      <option
-                          id="gnu.cpp.compiler.macosx.lib.debug.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.macosx.lib.debug.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
-                      <option
-                          id="gnu.c.compiler.macosx.lib.debug.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.lib.debug.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.toolmacosx.lib.debug.gnu.archiver"
-                      superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base">
-                  </tool>                                   
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.macosx.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
-				  </tool>   
-               </toolChain>                                                        
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
+                  id="cdt.managedbuild.toolchain.gnu.macosx.lib.debug">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.macosx.lib.debug"
+                     superClass="cdt.managedbuild.target.gnu.platform.macosx.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
+                     id="cdt.managedbuild.target.gnu.builder.macosx.lib.debug" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
+                  <option
+                        id="gnu.cpp.compiler.macosx.lib.debug.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.macosx.lib.debug.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.macosx.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
+                  <option
+                        id="gnu.c.compiler.macosx.lib.debug.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.macosx.lib.debug.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.toolmacosx.lib.debug.gnu.archiver"
+                     superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.macosx.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
-               parent="cdt.managedbuild.config.gnu.macosx.base"       
+               parent="cdt.managedbuild.config.gnu.macosx.base"
                cleanCommand="rm -rf"
-	            buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
                id="cdt.managedbuild.config.macosx.lib.release">
-               <toolChain
- 					 superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
-                     id="cdt.managedbuild.toolchain.gnu.macosx.lib.release">
-                  <targetPlatform
-					  id="cdt.managedbuild.target.gnu.platform.macosx.lib.release"
-					  superClass="cdt.managedbuild.target.gnu.platform.macosx.base">
-				  </targetPlatform>
-			  	  <builder
-					  superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
-					  id="cdt.managedbuild.target.gnu.builder.macosx.lib.release">		              
-			      </builder>               		         
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.lib.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
-                      <option
-                          id="gnu.cpp.compiler.macosx.lib.release.option.optimization.level"
-                          superClass="gnu.cpp.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.cpp.compiler.macosx.lib.release.option.debugging.level"
-                          superClass="gnu.cpp.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.lib.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
-                      <option
-                          id="gnu.c.compiler.macosx.lib.release.option.optimization.level"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.lib.release.option.debugging.level"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.toolmacosx.lib.release.gnu.archiver"
-                      superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base">
-                  </tool>                 
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.assembler.macosx.lib.release"
-					  superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base">
-				  </tool>   
-               </toolChain>                                                                   
-         </configuration>      
-      </projectType>      
-        
+            <toolChain
+                  superClass="cdt.managedbuild.toolchain.gnu.macosx.base"
+                  id="cdt.managedbuild.toolchain.gnu.macosx.lib.release">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.platform.macosx.lib.release"
+                     superClass="cdt.managedbuild.target.gnu.platform.macosx.base" />
+               <builder
+                     superClass="cdt.managedbuild.target.gnu.builder.macosx.base"
+                     id="cdt.managedbuild.target.gnu.builder.macosx.lib.release" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.base">
+                  <option
+                        id="gnu.cpp.compiler.macosx.lib.release.option.optimization.level"
+                        superClass="gnu.cpp.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.cpp.compiler.macosx.lib.release.option.debugging.level"
+                        superClass="gnu.cpp.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.macosx.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.macosx.base">
+                  <option
+                        id="gnu.c.compiler.macosx.lib.release.option.optimization.level"
+                        superClass="gnu.c.compiler.option.optimization.level" />
+                  <option
+                        id="gnu.c.compiler.macosx.lib.release.option.debugging.level"
+                        superClass="gnu.c.compiler.option.debugging.level" />
+               </tool>
+               <tool
+                     id="cdt.managedbuild.toolmacosx.lib.release.gnu.archiver"
+                     superClass="cdt.managedbuild.tool.gnu.archiver.macosx.base">
+               </tool>
+               <tool
+                     id="cdt.managedbuild.tool.gnu.assembler.macosx.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.assembler.macosx.base" />
+            </toolChain>
+         </configuration>
+      </projectType>
       <configuration
             cleanCommand="rm -rf"
             id="cdt.managedbuild.config.gnu.solaris.base"
             languageSettingsProviders="org.eclipse.cdt.ui.UserLanguageSettingsProvider;org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider;org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider;${Toolchain};-org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser">
-		    <enablement type="CONTAINER_ATTRIBUTE" 
-              	attribute="artifactExtension" 
-              	value="so"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"/>
-			  </enablement>
-		    <enablement type="CONTAINER_ATTRIBUTE" 
-              	attribute="artifactExtension" 
-              	value="a"
-              	extensionAdjustment="false">
-			  	<checkBuildProperty 
-			  		property="org.eclipse.cdt.build.core.buildArtefactType"
-			  		value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-			  </enablement>
-		</configuration>
-      
-      <projectType      
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
+               value="so"
+               extensionAdjustment="false">
+            <checkBuildProperty
+                  property="org.eclipse.cdt.build.core.buildArtefactType"
+                  value="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" />
+         </enablement>
+         <enablement
+               type="CONTAINER_ATTRIBUTE"
+               attribute="artifactExtension"
+               value="a"
+               extensionAdjustment="false">
+            <checkBuildProperty
+                  property="org.eclipse.cdt.build.core.buildArtefactType"
+                  value="org.eclipse.cdt.build.core.buildArtefactType.staticLib" />
+         </enablement>
+      </configuration>
+      <projectType
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
-            isAbstract="false"     
+            isAbstract="false"
             isTest="false"
             id="cdt.managedbuild.target.gnu.solaris.exe">
          <configuration
                name="%ConfigName.Dbg"
-            buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
                id="cdt.managedbuild.config.gnu.solaris.exe.debug"
-               parent="cdt.managedbuild.config.gnu.solaris.base">               
-               <toolChain
-                     id="cdt.managedbuild.toolchain.gnu.solaris.exe.debug"
-                     superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.solaris.platform.exe.debug"
-		              superClass="cdt.managedbuild.target.gnu.solaris.base">
-	              </targetPlatform>
-				  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base">                          
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base">                          
-				  </tool>
-			  </toolChain>
+               parent="cdt.managedbuild.config.gnu.solaris.base">
+            <toolChain
+                  id="cdt.managedbuild.toolchain.gnu.solaris.exe.debug"
+                  superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.solaris.platform.exe.debug"
+                     superClass="cdt.managedbuild.target.gnu.solaris.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.c.compiler.exe.debug"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
                id="cdt.managedbuild.config.gnu.solaris.exe.release"
-             buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
-               parent="cdt.managedbuild.config.gnu.solaris.base">               
-               <toolChain
-                     id="cdt.managedbuild.toolchain.gnu.solaris.exe.release"
-                     superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.solaris.platform.exe.release"
-		              superClass="cdt.managedbuild.target.gnu.solaris.base">
-	              </targetPlatform>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.exe.release"
-                       superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base">                          
-                  </tool>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base">                          
-                  </tool>
-               </toolChain>
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
+               parent="cdt.managedbuild.config.gnu.solaris.base">
+            <toolChain
+                  id="cdt.managedbuild.toolchain.gnu.solaris.exe.release"
+                  superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.solaris.platform.exe.release"
+                     superClass="cdt.managedbuild.target.gnu.solaris.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.c.compiler.exe.release"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base" />
+            </toolChain>
          </configuration>
-      </projectType>     
-      
-      <projectType      
-            isAbstract="false"     
+      </projectType>
+      <projectType
+            isAbstract="false"
             isTest="false"
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
             id="cdt.managedbuild.target.gnu.solaris.so">
          <configuration
                name="%ConfigName.Dbg"
-            buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
-			parent="cdt.managedbuild.config.gnu.solaris.base"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
+               parent="cdt.managedbuild.config.gnu.solaris.base"
                id="cdt.managedbuild.config.gnu.solaris.so.debug">
-               <toolChain
-                     id="cdt.managedbuild.toolchain.gnu.solaris.so.debug"
-                     superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.solaris.platform.so.debug"
-		              superClass="cdt.managedbuild.target.gnu.solaris.base">
-	              </targetPlatform>
-				  <tool
-				      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base">                          
-				  </tool>
-				  <tool
-				      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base">                          
-				  </tool>
-			   </toolChain>
+            <toolChain
+                  id="cdt.managedbuild.toolchain.gnu.solaris.so.debug"
+                  superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.solaris.platform.so.debug"
+                     superClass="cdt.managedbuild.target.gnu.solaris.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.c.compiler.so.debug"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
-            buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
-			parent="cdt.managedbuild.config.gnu.solaris.base"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
+               parent="cdt.managedbuild.config.gnu.solaris.base"
                id="cdt.managedbuild.config.gnu.solaris.so.release">
-               <toolChain
-                     id="cdt.managedbuild.toolchain.gnu.solaris.so.release"
-                     superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.solaris.platform.so.release"
-		              superClass="cdt.managedbuild.target.gnu.solaris.base">
-	              </targetPlatform>
-				  <tool
-				      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base">                          
-				  </tool>				
-				  <tool				     
-				      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base">                          
-				  </tool>
-			   </toolChain>  
-         </configuration>         
+            <toolChain
+                  id="cdt.managedbuild.toolchain.gnu.solaris.so.release"
+                  superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.solaris.platform.so.release"
+                     superClass="cdt.managedbuild.target.gnu.solaris.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.c.compiler.so.release"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base" />
+            </toolChain>
+         </configuration>
       </projectType>
-          
-      <projectType 
+      <projectType
             isTest="false"
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib"
             isAbstract="false"
-            id="cdt.managedbuild.target.gnu.solaris.lib">                        
+            id="cdt.managedbuild.target.gnu.solaris.lib">
          <configuration
-			   name="%ConfigName.Dbg"
-            buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
-			parent="cdt.managedbuild.config.gnu.solaris.base"
-			   id="cdt.managedbuild.config.gnu.solaris.lib.debug">
-               <toolChain
-                     id="cdt.managedbuild.toolchain.gnu.solaris.lib.debug"
-                     superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.solaris.platform.lib.debug"
-		              superClass="cdt.managedbuild.target.gnu.solaris.base">
-	              </targetPlatform>
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base">                          
-                  </tool>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.solaris.c.compiler.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base">                          
-				  </tool>
-               </toolChain>                 
+               name="%ConfigName.Dbg"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
+               parent="cdt.managedbuild.config.gnu.solaris.base"
+               id="cdt.managedbuild.config.gnu.solaris.lib.debug">
+            <toolChain
+                  id="cdt.managedbuild.toolchain.gnu.solaris.lib.debug"
+                  superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.solaris.platform.lib.debug"
+                     superClass="cdt.managedbuild.target.gnu.solaris.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.c.compiler.lib.debug"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base" />
+            </toolChain>
          </configuration>
          <configuration
                name="%ConfigName.Rel"
-             buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
-			parent="cdt.managedbuild.config.gnu.solaris.base"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
+               parent="cdt.managedbuild.config.gnu.solaris.base"
                id="cdt.managedbuild.config.gnu.solaris.lib.release">
-               <toolChain
-                     id="cdt.managedbuild.toolchain.gnu.solaris.lib.release"
-                     superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
-		          <targetPlatform
-		              id="cdt.managedbuild.target.gnu.solaris.platform.lib.release"
-		              superClass="cdt.managedbuild.target.gnu.solaris.base">
-	              </targetPlatform>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.lib.release"
-					  superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base">                          
-				  </tool>
-		          <tool
-					  id="cdt.managedbuild.tool.gnu.solaris.c.compiler.lib.release"
-                      superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base">                          
-				  </tool>
-               </toolChain>				  
-         </configuration>                  
+            <toolChain
+                  id="cdt.managedbuild.toolchain.gnu.solaris.lib.release"
+                  superClass="cdt.managedbuild.toolchain.gnu.solaris.base">
+               <targetPlatform
+                     id="cdt.managedbuild.target.gnu.solaris.platform.lib.release"
+                     superClass="cdt.managedbuild.target.gnu.solaris.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.base" />
+               <tool
+                     id="cdt.managedbuild.tool.gnu.solaris.c.compiler.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.solaris.c.compiler.base" />
+            </toolChain>
+         </configuration>
       </projectType>
    </extension>
-
    <extension point="org.eclipse.cdt.core.templates">
       <template
             id="org.eclipse.cdt.build.core.templates.HelloWorldCCProject"
-            filterPattern=".*g\+\+"
+            filterPattern=".*g++"
             location="$nl$/templates/projecttemplates/HelloWorldCCProject/template.xml"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
+            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe" />
       <template
             id="org.eclipse.cdt.build.core.templates.HelloWorldCAnsiProject"
             filterPattern=".*gcc"
             location="$nl$/templates/projecttemplates/HelloWorldCAnsiProject/template.xml"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>      
+            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe" />
       <template
             id="org.eclipse.cdt.build.core.templates.MakefileHelloWorldCCProject"
-            filterPattern=".*g\+\+"
+            filterPattern=".*g++"
             location="$nl$/templates/projecttemplates/MakefileHelloWorldCCProject/template.xml"
-            projectType="org.eclipse.cdt.build.makefile.projectType">
-      </template>
-      </extension>
-
-<extension
-      point="org.eclipse.cdt.core.templateAssociations">
+            projectType="org.eclipse.cdt.build.makefile.projectType" />
+   </extension>
+   <extension point="org.eclipse.cdt.core.templateAssociations">
       <template id="org.eclipse.cdt.build.core.templates.EmptyProject">
-            <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.cygwin.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.solaris.base"/>
+         <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.cygwin.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.solaris.base" />
       </template>
       <template id="org.eclipse.cdt.build.core.templates.HelloWorldCAnsiProject">
-            <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.cygwin.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.solaris.base"/>
+         <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.cygwin.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.solaris.base" />
       </template>
       <template id="org.eclipse.cdt.build.core.templates.HelloWorldCCProject">
-            <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.cygwin.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.solaris.base"/>
+         <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.cygwin.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.solaris.base" />
       </template>
-      <template
-            id="org.eclipse.cdt.build.core.templates.MakefileHelloWorldCCProject">
-            <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.cygwin.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base"/>
-            <toolChain id="cdt.managedbuild.toolchain.gnu.solaris.base"/>
+      <template id="org.eclipse.cdt.build.core.templates.MakefileHelloWorldCCProject">
+         <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.cygwin.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.macosx.base" />
+         <toolChain id="cdt.managedbuild.toolchain.gnu.solaris.base" />
       </template>
-</extension>
-<extension
-      point="org.eclipse.cdt.core.templateProcessTypes">
-   <processType
-         name="SimpleGNUMakefileGenerator"
-         processRunner="org.eclipse.cdt.managedbuilder.gnu.templates.SimpleMakefileGenerator">
-      <simple
-            name="projectName">
-      </simple>
-   </processType>
-</extension>
-
+   </extension>
+   <extension point="org.eclipse.cdt.core.templateProcessTypes">
+      <processType
+            name="SimpleGNUMakefileGenerator"
+            processRunner="org.eclipse.cdt.managedbuilder.gnu.templates.SimpleMakefileGenerator">
+         <simple name="projectName" />
+      </processType>
+   </extension>
 </plugin>