From 8260954b95bfaf8ec2d42b60a5af5dad52cd1ca1 Mon Sep 17 00:00:00 2001
From: Leo Treggiari <leo.treggiari@intel.com>
Date: Fri, 3 Mar 2006 19:21:02 +0000
Subject: [PATCH] Implement cdt-dev suggestion for mixed C/C++ projects -
 change C compiler project nature to "both"

---
 .../plugin.xml                                | 562 +++++++++---------
 1 file changed, 281 insertions(+), 281 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 403e73a8945..a823ca17d7e 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -749,7 +749,7 @@
 		  id="cdt.managedbuild.tool.gnu.c.compiler"
 		  isAbstract="true"
 		  command="gcc"
-		  natureFilter="cnature"
+		  natureFilter="both"
 		  outputFlag="-o">
          <envVarBuildPath 
          	pathType="buildpathInclude"
@@ -1337,20 +1337,6 @@
 		              arguments="-k"
 		              buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">
 		     	  </builder>               
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">                          
-			  	      <option
-					      id="gnu.c.compiler.exe.debug.option.optimization.level"
-						  defaultValue="gnu.c.optimization.level.none"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option   
-					      id="gnu.c.compiler.exe.debug.option.debugging.level"					     
-						  defaultValue="gnu.c.debugging.level.max"
-					      superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-				  </tool>
 				  <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler">                         
@@ -1365,6 +1351,20 @@
                           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">                          
+			  	      <option
+					      id="gnu.c.compiler.exe.debug.option.optimization.level"
+						  defaultValue="gnu.c.optimization.level.none"
+						  superClass="gnu.c.compiler.option.optimization.level">
+					  </option>
+					  <option   
+					      id="gnu.c.compiler.exe.debug.option.debugging.level"					     
+						  defaultValue="gnu.c.debugging.level.max"
+					      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">
@@ -1406,20 +1406,6 @@
 		              arguments="-k"
 		              buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">
 				  </builder> 
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">                          
-					  <option
-						  id="gnu.c.compiler.exe.release.option.optimization.level"
-						  defaultValue="gnu.c.optimization.level.most"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.exe.release.option.debugging.level"
-						  defaultValue="gnu.c.debugging.level.none"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler">                     
@@ -1434,6 +1420,20 @@
 						  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">                          
+					  <option
+						  id="gnu.c.compiler.exe.release.option.optimization.level"
+						  defaultValue="gnu.c.optimization.level.most"
+						  superClass="gnu.c.compiler.option.optimization.level">
+					  </option>
+					  <option
+						  id="gnu.c.compiler.exe.release.option.debugging.level"
+						  defaultValue="gnu.c.debugging.level.none"
+						  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">
@@ -1483,20 +1483,6 @@
 		              arguments="-k"
 		              buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 				  </builder>               		         
-				  <tool
-				      id="cdt.managedbuild.tool.gnu.c.compiler.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler">
-					  <option
-						  id="gnu.c.compiler.so.debug.option.optimization.level"
-						  defaultValue="gnu.c.optimization.level.none"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-					      id="gnu.c.compiler.so.debug.option.debugging.level"
-						  defaultValue="gnu.c.debugging.level.max"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-				  </tool>
 				  <tool
 				      id="cdt.managedbuild.tool.gnu.cpp.compiler.so.debug"
 					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -1511,6 +1497,20 @@
 						  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">
+					  <option
+						  id="gnu.c.compiler.so.debug.option.optimization.level"
+						  defaultValue="gnu.c.optimization.level.none"
+						  superClass="gnu.c.compiler.option.optimization.level">
+					  </option>
+					  <option
+					      id="gnu.c.compiler.so.debug.option.debugging.level"
+						  defaultValue="gnu.c.debugging.level.max"
+						  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">
@@ -1577,20 +1577,6 @@
 		              arguments="-k"
 		              buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 				  </builder>               
-				  <tool				     
-				      id="cdt.managedbuild.tool.gnu.c.compiler.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler">
-				      <option
-				          id="gnu.c.compiler.so.release.option.optimization.level"
-						  defaultValue="gnu.c.optimization.level.most"
-						  superClass="gnu.c.compiler.option.optimization.level">
-				      </option>
-				      <option
-				          id="gnu.c.compiler.so.release.option.debugging.level"
-						  defaultValue="gnu.c.debugging.level.none"
-						  superClass="gnu.c.compiler.option.debugging.level">
-				      </option>
-				  </tool>
 				  <tool
 				      id="cdt.managedbuild.tool.gnu.cpp.compiler.so.release"
 					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -1605,6 +1591,20 @@
 						  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">
+				      <option
+				          id="gnu.c.compiler.so.release.option.optimization.level"
+						  defaultValue="gnu.c.optimization.level.most"
+						  superClass="gnu.c.compiler.option.optimization.level">
+				      </option>
+				      <option
+				          id="gnu.c.compiler.so.release.option.debugging.level"
+						  defaultValue="gnu.c.debugging.level.none"
+						  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">
@@ -1678,20 +1678,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		         
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler">
-				      <option
-					      id="gnu.c.compiler.lib.debug.option.optimization.level"
-						  defaultValue="gnu.c.optimization.level.none"
-						  superClass="gnu.c.compiler.option.optimization.level">
-				      </option>
-				      <option
-						  id="gnu.c.compiler.lib.debug.option.debugging.level"						
-						  defaultValue="gnu.c.debugging.level.max"
-						  superClass="gnu.c.compiler.option.debugging.level">
-				      </option>
-				  </tool>
                   <tool
 					  id="cdt.managedbuild.tool.gnu.cpp.compiler.lib.debug"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -1706,6 +1692,20 @@
 					      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">
+				      <option
+					      id="gnu.c.compiler.lib.debug.option.optimization.level"
+						  defaultValue="gnu.c.optimization.level.none"
+						  superClass="gnu.c.compiler.option.optimization.level">
+				      </option>
+				      <option
+						  id="gnu.c.compiler.lib.debug.option.debugging.level"						
+						  defaultValue="gnu.c.debugging.level.max"
+						  superClass="gnu.c.compiler.option.debugging.level">
+				      </option>
+				  </tool>
 			      <tool
 		    		  id="cdt.managedbuild.tool.gnu.archiver.lib.debug"
 			          superClass="cdt.managedbuild.tool.gnu.archiver">
@@ -1744,20 +1744,6 @@
 		              arguments="-k"
 		              buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 				  </builder>               		            
-		          <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.lib.release"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler">
-					  <option
-						  id="gnu.c.compiler.lib.release.option.optimization.level"
-						  defaultValue="gnu.c.optimization.level.most"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.lib.release.option.debugging.level"
-					      defaultValue="gnu.c.debugging.level.none"
-					      superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-				  </tool>
 				  <tool
 					  id="cdt.managedbuild.tool.gnu.cpp.compiler.lib.release"
 					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -1772,6 +1758,20 @@
 						  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">
+					  <option
+						  id="gnu.c.compiler.lib.release.option.optimization.level"
+						  defaultValue="gnu.c.optimization.level.most"
+						  superClass="gnu.c.compiler.option.optimization.level">
+					  </option>
+					  <option
+						  id="gnu.c.compiler.lib.release.option.debugging.level"
+					      defaultValue="gnu.c.debugging.level.none"
+					      superClass="gnu.c.compiler.option.debugging.level">
+					  </option>
+				  </tool>
 				  <tool
 					  id="cdt.managedbuild.tool.gnu.archiver.lib.release"
 				      superClass="cdt.managedbuild.tool.gnu.archiver">
@@ -1818,20 +1818,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		         
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin">
-					  <option
-						  id="gnu.c.compiler.cygwin.exe.debug.option.optimization.level"
-						  defaultValue="gnu.c.optimization.level.none"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.cygwin.exe.debug.option.debugging.level"
-						  defaultValue="gnu.c.debugging.level.max"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.exe.debug"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin">
@@ -1846,6 +1832,20 @@
                           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">
+					  <option
+						  id="gnu.c.compiler.cygwin.exe.debug.option.optimization.level"
+						  defaultValue="gnu.c.optimization.level.none"
+						  superClass="gnu.c.compiler.option.optimization.level">
+					  </option>
+					  <option
+						  id="gnu.c.compiler.cygwin.exe.debug.option.debugging.level"
+						  defaultValue="gnu.c.debugging.level.max"
+						  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">
@@ -1889,20 +1889,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		                       
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin">
-                      <option
-                          id="gnu.c.compiler.cygwin.exe.release.option.optimization.level"
-                          defaultValue="gnu.c.optimization.level.most"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.cygwin.exe.release.option.debugging.level"
-                          defaultValue="gnu.c.debugging.level.none"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.exe.release"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin">
@@ -1917,6 +1903,20 @@
                           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">
+                      <option
+                          id="gnu.c.compiler.cygwin.exe.release.option.optimization.level"
+                          defaultValue="gnu.c.optimization.level.most"
+                          superClass="gnu.c.compiler.option.optimization.level">
+                      </option>
+                      <option
+                          id="gnu.c.compiler.cygwin.exe.release.option.debugging.level"
+                          defaultValue="gnu.c.debugging.level.none"
+                          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">
@@ -1967,20 +1967,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		         
-                  <tool
-					  id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin">
-					  <option
-						  id="gnu.c.compiler.cygwin.so.debug.option.optimization.level"
-						  defaultValue="gnu.c.optimization.level.none"
-						  superClass="gnu.c.compiler.option.optimization.level">
-					  </option>
-					  <option
-						  id="gnu.c.compiler.cygwin.so.debug.option.debugging.level"
-						  defaultValue="gnu.c.debugging.level.max"
-						  superClass="gnu.c.compiler.option.debugging.level">
-					  </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.so.debug"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin">
@@ -1995,6 +1981,20 @@
                           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">
+					  <option
+						  id="gnu.c.compiler.cygwin.so.debug.option.optimization.level"
+						  defaultValue="gnu.c.optimization.level.none"
+						  superClass="gnu.c.compiler.option.optimization.level">
+					  </option>
+					  <option
+						  id="gnu.c.compiler.cygwin.so.debug.option.debugging.level"
+						  defaultValue="gnu.c.debugging.level.max"
+						  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">
@@ -2060,20 +2060,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		                                       
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin">
-                      <option 
-                          id="gnu.c.compiler.cygwin.so.release.option.optimization.level"
-                          defaultValue="gnu.c.optimization.level.most"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.cygwin.so.release.option.debugging.level"
-                          defaultValue="gnu.c.debugging.level.none"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.so.release"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin">
@@ -2088,6 +2074,20 @@
                           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">
+                      <option 
+                          id="gnu.c.compiler.cygwin.so.release.option.optimization.level"
+                          defaultValue="gnu.c.optimization.level.most"
+                          superClass="gnu.c.compiler.option.optimization.level">
+                      </option>
+                      <option
+                          id="gnu.c.compiler.cygwin.so.release.option.debugging.level"
+                          defaultValue="gnu.c.debugging.level.none"
+                          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">
@@ -2160,20 +2160,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		                                                              
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin">
-                      <option
-                          id="gnu.c.compiler.cygwin.lib.debug.option.optimization.level"
-                          defaultValue="gnu.c.optimization.level.none"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.cygwin.lib.debug.option.debugging.level"
-                          defaultValue="gnu.c.debugging.level.max"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
 			      <tool
 			          id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.lib.debug"
 					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin">
@@ -2188,6 +2174,20 @@
 							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">
+                      <option
+                          id="gnu.c.compiler.cygwin.lib.debug.option.optimization.level"
+                          defaultValue="gnu.c.optimization.level.none"
+                          superClass="gnu.c.compiler.option.optimization.level">
+                      </option>
+                      <option
+                          id="gnu.c.compiler.cygwin.lib.debug.option.debugging.level"
+                          defaultValue="gnu.c.debugging.level.max"
+                          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">
@@ -2227,20 +2227,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		                                                                                              
-                  <tool
-                     id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.lib.release"
-                     superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin">
-                     <option
-                         id="gnu.c.compiler.cygwin.lib.release.option.optimization.level"
-                         defaultValue="gnu.c.optimization.level.most"
-                         superClass="gnu.c.compiler.option.optimization.level">
-                     </option>
-                     <option
-                         id="gnu.c.compiler.cygwin.lib.release.option.debugging.level"                        
-                         defaultValue="gnu.c.debugging.level.none"
-                         superClass="gnu.c.compiler.option.debugging.level">                         
-                     </option>
-                  </tool>
                   <tool
                      id="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin.lib.release"
                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.cygwin">
@@ -2255,6 +2241,20 @@
                          superClass="gnu.cpp.compiler.option.debugging.level">
                      </option>
                  </tool>
+                  <tool
+                     id="cdt.managedbuild.tool.gnu.c.compiler.cygwin.lib.release"
+                     superClass="cdt.managedbuild.tool.gnu.c.compiler.cygwin">
+                     <option
+                         id="gnu.c.compiler.cygwin.lib.release.option.optimization.level"
+                         defaultValue="gnu.c.optimization.level.most"
+                         superClass="gnu.c.compiler.option.optimization.level">
+                     </option>
+                     <option
+                         id="gnu.c.compiler.cygwin.lib.release.option.debugging.level"                        
+                         defaultValue="gnu.c.debugging.level.none"
+                         superClass="gnu.c.compiler.option.debugging.level">                         
+                     </option>
+                  </tool>
                  <tool
                      id="cdt.managedbuild.tool.gnu.archiver.cygwin.lib.release"
                      superClass="cdt.managedbuild.tool.gnu.archiver">
@@ -2299,20 +2299,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		         
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
-                      <option
-                          id="gnu.c.compiler.macosx.exe.debug.option.optimization.level"
-                          defaultValue="gnu.c.optimization.level.none"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.exe.debug.option.debugging.level"
-                          defaultValue="gnu.c.debugging.level.max"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.debug"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -2326,6 +2312,20 @@
                           defaultValue="gnu.cpp.compiler.debugging.level.max"
                           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">
+                      <option
+                          id="gnu.c.compiler.macosx.exe.debug.option.optimization.level"
+                          defaultValue="gnu.c.optimization.level.none"
+                          superClass="gnu.c.compiler.option.optimization.level">
+                      </option>
+                      <option
+                          id="gnu.c.compiler.macosx.exe.debug.option.debugging.level"
+                          defaultValue="gnu.c.debugging.level.max"
+                          superClass="gnu.c.compiler.option.debugging.level">
+                      </option>
                   </tool>
 				  <tool
 				      id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.debug"
@@ -2368,20 +2368,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		         
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
-                      <option
-                          id="gnu.c.compiler.macosx.exe.release.option.optimization.level"
-                          defaultValue="gnu.c.optimization.level.most"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.exe.release.option.debugging.level"
-                          defaultValue="gnu.c.debugging.level.none"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                   </tool>
                    <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.exe.release"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -2395,6 +2381,20 @@
                           defaultValue="gnu.cpp.compiler.debugging.level.none"
                           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">
+                      <option
+                          id="gnu.c.compiler.macosx.exe.release.option.optimization.level"
+                          defaultValue="gnu.c.optimization.level.most"
+                          superClass="gnu.c.compiler.option.optimization.level">
+                      </option>
+                      <option
+                          id="gnu.c.compiler.macosx.exe.release.option.debugging.level"
+                          defaultValue="gnu.c.debugging.level.none"
+                          superClass="gnu.c.compiler.option.debugging.level">
+                      </option>
                    </tool>
 				   <tool
 				       id="cdt.managedbuild.tool.macosx.c.linker.macosx.exe.release"
@@ -2445,20 +2445,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		                       
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.so.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
-                      <option
-                          id="gnu.c.compiler.macosx.so.debug.option.optimization.level"
-                          defaultValue="gnu.c.optimization.level.none"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.so.debug.option.debugging.level"
-                          defaultValue="gnu.c.debugging.level.max"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.so.debug"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -2472,6 +2458,20 @@
 						  defaultValue="gnu.cpp.compiler.debugging.level.max"
 						  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">
+                      <option
+                          id="gnu.c.compiler.macosx.so.debug.option.optimization.level"
+                          defaultValue="gnu.c.optimization.level.none"
+                          superClass="gnu.c.compiler.option.optimization.level">
+                      </option>
+                      <option
+                          id="gnu.c.compiler.macosx.so.debug.option.debugging.level"
+                          defaultValue="gnu.c.debugging.level.max"
+                          superClass="gnu.c.compiler.option.debugging.level">
+                      </option>
                   </tool>
 				  <tool
 				      id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.debug"
@@ -2549,20 +2549,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		                                                     
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.so.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
-                      <option
-                          id="gnu.c.compiler.macosx.so.release.option.optimization.level"
-                          defaultValue="gnu.c.optimization.level.most"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.so.release.option.debugging.level"
-                          defaultValue="gnu.c.debugging.level.none"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.so.release"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -2576,6 +2562,20 @@
                           defaultValue="gnu.cpp.compiler.debugging.level.none"
                           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">
+                      <option
+                          id="gnu.c.compiler.macosx.so.release.option.optimization.level"
+                          defaultValue="gnu.c.optimization.level.most"
+                          superClass="gnu.c.compiler.option.optimization.level">
+                      </option>
+                      <option
+                          id="gnu.c.compiler.macosx.so.release.option.debugging.level"
+                          defaultValue="gnu.c.debugging.level.none"
+                          superClass="gnu.c.compiler.option.debugging.level">
+                      </option>
                   </tool>
 				  <tool
 				      id="cdt.managedbuild.tool.macosx.c.linker.macosx.so.release"
@@ -2660,20 +2660,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		         
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.lib.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
-                      <option
-                          id="gnu.c.compiler.macosx.lib.debug.option.optimization.level"
-                          defaultValue="gnu.c.optimization.level.none"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.lib.debug.option.debugging.level"
-                          defaultValue="gnu.c.debugging.level.max"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.lib.debug"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -2688,6 +2674,20 @@
                           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">
+                      <option
+                          id="gnu.c.compiler.macosx.lib.debug.option.optimization.level"
+                          defaultValue="gnu.c.optimization.level.none"
+                          superClass="gnu.c.compiler.option.optimization.level">
+                      </option>
+                      <option
+                          id="gnu.c.compiler.macosx.lib.debug.option.debugging.level"
+                          defaultValue="gnu.c.debugging.level.max"
+                          superClass="gnu.c.compiler.option.debugging.level">
+                      </option>
+                  </tool>
                   <tool
                       id="cdt.managedbuild.toolmacosx.lib.debug.gnu.archiver"
                       superClass="cdt.managedbuild.tool.gnu.archiver">
@@ -2726,20 +2726,6 @@
 					  arguments="-k"
 					  buildfileGenerator="org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator">		              
 			      </builder>               		         
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.c.compiler.macosx.lib.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
-                      <option
-                          id="gnu.c.compiler.macosx.lib.release.option.optimization.level"
-                          defaultValue="gnu.c.optimization.level.most"
-                          superClass="gnu.c.compiler.option.optimization.level">
-                      </option>
-                      <option
-                          id="gnu.c.compiler.macosx.lib.release.option.debugging.level"
-                          defaultValue="gnu.c.debugging.level.none"
-                          superClass="gnu.c.compiler.option.debugging.level">
-                      </option>
-                  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.macosx.lib.release"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
@@ -2754,6 +2740,20 @@
                           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">
+                      <option
+                          id="gnu.c.compiler.macosx.lib.release.option.optimization.level"
+                          defaultValue="gnu.c.optimization.level.most"
+                          superClass="gnu.c.compiler.option.optimization.level">
+                      </option>
+                      <option
+                          id="gnu.c.compiler.macosx.lib.release.option.debugging.level"
+                          defaultValue="gnu.c.debugging.level.none"
+                          superClass="gnu.c.compiler.option.debugging.level">
+                      </option>
+                  </tool>
                   <tool
                       id="cdt.managedbuild.toolmacosx.lib.release.gnu.archiver"
                       superClass="cdt.managedbuild.tool.gnu.archiver">
@@ -2788,16 +2788,16 @@
 		              osList="solaris"
 		              archList="all">
 	              </targetPlatform>
-                  <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.exe.debug"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug"
-                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
-				  </tool>
 				  <tool
                       id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.exe.debug"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug"
                       commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
                   </tool>
+                  <tool
+                      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.exe.debug"
+                      superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.debug"
+                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
+				  </tool>
 			  </toolChain>
          </configuration>
          <configuration
@@ -2818,13 +2818,13 @@
 		              archList="all">
 	              </targetPlatform>
                   <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release"
+                      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.exe.release"
+                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"                     
                       commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
                   </tool>
                   <tool
-                      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.exe.release"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release"                     
+                      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.exe.release"
+                      superClass="cdt.managedbuild.tool.gnu.c.compiler.exe.release"
                       commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
                   </tool>
                </toolChain>
@@ -2855,13 +2855,13 @@
 		              archList="all">
 	              </targetPlatform>
 				  <tool
-				      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler.so.debug"
+				      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.so.debug"
+					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.so.debug"
                       commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
 				  </tool>
 				  <tool
-				      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.so.debug"
-					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.so.debug"
+				      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.so.debug"
+					  superClass="cdt.managedbuild.tool.gnu.c.compiler.so.debug"
                       commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
 				  </tool>
 			   </toolChain>
@@ -2884,16 +2884,16 @@
 		              osList="solaris"
 		              archList="all">
 	              </targetPlatform>
-				  <tool				     
-				      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.so.release"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler.so.release"
-                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
-				  </tool>
 				  <tool
 				      id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.so.release"
 					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.so.release"
                       commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
 				  </tool>				
+				  <tool				     
+				      id="cdt.managedbuild.tool.gnu.solaris.c.compiler.so.release"
+					  superClass="cdt.managedbuild.tool.gnu.c.compiler.so.release"
+                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
+				  </tool>
 			   </toolChain>  
          </configuration>         
       </projectType>
@@ -2921,16 +2921,16 @@
 		              osList="solaris"
 		              archList="all">
 	              </targetPlatform>
-				  <tool
-					  id="cdt.managedbuild.tool.gnu.solaris.c.compiler.lib.debug"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler.lib.debug"
-                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
-				  </tool>
                   <tool
 					  id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.lib.debug"
                       superClass="cdt.managedbuild.tool.gnu.cpp.compiler.lib.debug"
                       commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
                   </tool>
+				  <tool
+					  id="cdt.managedbuild.tool.gnu.solaris.c.compiler.lib.debug"
+					  superClass="cdt.managedbuild.tool.gnu.c.compiler.lib.debug"
+                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
+				  </tool>
                </toolChain>                 
          </configuration>
          <configuration
@@ -2951,16 +2951,16 @@
 		              osList="solaris"
 		              archList="all">
 	              </targetPlatform>
-		          <tool
-					  id="cdt.managedbuild.tool.gnu.solaris.c.compiler.lib.release"
-					  superClass="cdt.managedbuild.tool.gnu.c.compiler.lib.release"
-                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
-				  </tool>
 				  <tool
 					  id="cdt.managedbuild.tool.gnu.solaris.cpp.compiler.lib.release"
 					  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.lib.release"
                       commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
 				  </tool>
+		          <tool
+					  id="cdt.managedbuild.tool.gnu.solaris.c.compiler.lib.release"
+					  superClass="cdt.managedbuild.tool.gnu.c.compiler.lib.release"
+                      commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}">                          
+				  </tool>
                </toolChain>				  
          </configuration>                  
       </projectType>