Index: org.rtems.cdt.toolchain2/plugin.xml
===================================================================
--- org.rtems.cdt.toolchain2/plugin.xml	(revision f124b043df9b420e881bf58801a8a85b894982a0)
+++ org.rtems.cdt.toolchain2/plugin.xml	(revision 8d045c31e21abfcfcdbb11e450aad6f21a656469)
@@ -2,239 +2,239 @@
 <?eclipse version="3.2"?>
 <!--
-	Copyright (c) 2008
-	Embedded Brains GmbH
-	Obere Lagerstr. 30
-	D-82178 Puchheim
-	Germany
-	rtems@embedded-brains.de
-	
-	The license and distribution terms for this file may be found in the file
-	LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
+   Copyright (c) 2008
+   Embedded Brains GmbH
+   Obere Lagerstr. 30
+   D-82178 Puchheim
+   Germany
+   rtems@embedded-brains.de
+   
+   The license and distribution terms for this file may be found in the file
+   LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
 -->
 <plugin>
-	<!-- Scanner Configuration Discovery Profiles -->
-	<extension
-			id="RtemsSCDProfile"
-			name="RTEMS Scanner Configuration Discovery Profile (UNIX)"
-			point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
-		<scannerInfoCollector
-				class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
-				scope="project"/>
-		<buildOutputProvider>
-			<open/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
-		</buildOutputProvider>
-		<scannerInfoProvider providerId="specsFile">
-			<run
-					arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"
-					command="powerpc-rtems4.10-gcc"
-					class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
-		</scannerInfoProvider>
-	</extension>
-	<extension
-			id="RtemsSCDProfileC"
-			name="RTEMS Scanner Configuration Discovery Profile (UNIX)"
-			point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
-		<scannerInfoCollector
-				class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
-				scope="project"/>
-		<buildOutputProvider>
-			<open/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
-		</buildOutputProvider>
-		<scannerInfoProvider providerId="specsFile">
-			<run
-					arguments="-E -P -v -dD ${plugin_state_location}/specs.c"
-					command="powerpc-rtems4.10-gcc"
-					class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
-		</scannerInfoProvider>
-	</extension>
-	<extension
-			id="RtemsSCDProfileCPP"
-			name="RTEMS Scanner Configuration Discovery Profile (UNIX)"
-			point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
-		<scannerInfoCollector
-				class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
-				scope="project"/>
-		<buildOutputProvider>
-			<open/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
-		</buildOutputProvider>
-		<scannerInfoProvider providerId="specsFile">
-			<run
-					arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp"
-					command="powerpc-rtems4.10-g++"
-					class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
-		</scannerInfoProvider>
-	</extension>
-	<extension
-			id="RtemsSCDProfileWin"
-			name="RTEMS Scanner Configuration Discovery Profile (Windows)"
-			point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
-		<scannerInfoCollector
-				class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
-				scope="project"/>
-		<buildOutputProvider>
-			<open/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
-		</buildOutputProvider>
-		<scannerInfoProvider providerId="specsFile">
-			<run
-					arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"
-					command="powerpc-rtems4.10-gcc"
-					class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
-		</scannerInfoProvider>
-	</extension>
-	<extension
-			id="RtemsSCDProfileWinC"
-			name="RTEMS Scanner Configuration Discovery Profile (Windows)"
-			point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
-		<scannerInfoCollector
-				class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
-				scope="project"/>
-		<buildOutputProvider>
-			<open/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
-		</buildOutputProvider>
-		<scannerInfoProvider providerId="specsFile">
-			<run
-					arguments="-E -P -v -dD ${plugin_state_location}/specs.c"
-					command="powerpc-rtems4.10-gcc"
-					class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
-		</scannerInfoProvider>
-	</extension>
-	<extension
-			id="RtemsSCDProfileWinCPP"
-			name="RTEMS Scanner Configuration Discovery Profile (Windows)"
-			point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
-		<scannerInfoCollector
-				class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
-				scope="project"/>
-		<buildOutputProvider>
-			<open/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
-		</buildOutputProvider>
-		<scannerInfoProvider providerId="specsFile">
-			<run
-					arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp"
-					command="powerpc-rtems4.10-g++"
-					class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
-			<scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
-		</scannerInfoProvider>
-	</extension>
+   <!-- Scanner Configuration Discovery Profiles -->
+   <extension
+         id="RtemsSCDProfile"
+         name="RTEMS Scanner Configuration Discovery Profile (UNIX)"
+         point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
+      <scannerInfoCollector
+            class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
+            scope="project"/>
+      <buildOutputProvider>
+         <open/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
+      </buildOutputProvider>
+      <scannerInfoProvider providerId="specsFile">
+         <run
+               arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"
+               command="powerpc-rtems4.10-gcc"
+               class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
+      </scannerInfoProvider>
+   </extension>
+   <extension
+         id="RtemsSCDProfileC"
+         name="RTEMS Scanner Configuration Discovery Profile (UNIX)"
+         point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
+      <scannerInfoCollector
+            class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
+            scope="project"/>
+      <buildOutputProvider>
+         <open/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
+      </buildOutputProvider>
+      <scannerInfoProvider providerId="specsFile">
+         <run
+               arguments="-E -P -v -dD ${plugin_state_location}/specs.c"
+               command="powerpc-rtems4.10-gcc"
+               class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
+      </scannerInfoProvider>
+   </extension>
+   <extension
+         id="RtemsSCDProfileCPP"
+         name="RTEMS Scanner Configuration Discovery Profile (UNIX)"
+         point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
+      <scannerInfoCollector
+            class="org.eclipse.cdt.make.internal.core.scannerconfig2.PerProjectSICollector"
+            scope="project"/>
+      <buildOutputProvider>
+         <open/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
+      </buildOutputProvider>
+      <scannerInfoProvider providerId="specsFile">
+         <run
+               arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp"
+               command="powerpc-rtems4.10-g++"
+               class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
+      </scannerInfoProvider>
+   </extension>
+   <extension
+         id="RtemsSCDProfileWin"
+         name="RTEMS Scanner Configuration Discovery Profile (Windows)"
+         point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
+      <scannerInfoCollector
+            class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
+            scope="project"/>
+      <buildOutputProvider>
+         <open/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
+      </buildOutputProvider>
+      <scannerInfoProvider providerId="specsFile">
+         <run
+               arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}"
+               command="powerpc-rtems4.10-gcc"
+               class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
+      </scannerInfoProvider>
+   </extension>
+   <extension
+         id="RtemsSCDProfileWinC"
+         name="RTEMS Scanner Configuration Discovery Profile (Windows)"
+         point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
+      <scannerInfoCollector
+            class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
+            scope="project"/>
+      <buildOutputProvider>
+         <open/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
+      </buildOutputProvider>
+      <scannerInfoProvider providerId="specsFile">
+         <run
+               arguments="-E -P -v -dD ${plugin_state_location}/specs.c"
+               command="powerpc-rtems4.10-gcc"
+               class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
+      </scannerInfoProvider>
+   </extension>
+   <extension
+         id="RtemsSCDProfileWinCPP"
+         name="RTEMS Scanner Configuration Discovery Profile (Windows)"
+         point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
+      <scannerInfoCollector
+            class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.DefaultGnuWinScannerInfoCollector"
+            scope="project"/>
+      <buildOutputProvider>
+         <open/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.managedbuilder.internal.scannerconfig.ManagedGCCScannerInfoConsoleParser"/>
+      </buildOutputProvider>
+      <scannerInfoProvider providerId="specsFile">
+         <run
+               arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp"
+               command="powerpc-rtems4.10-g++"
+               class="org.eclipse.cdt.make.internal.core.scannerconfig2.GCCSpecsRunSIProvider"/>
+         <scannerInfoConsoleParser class="org.eclipse.cdt.make.internal.core.scannerconfig.gnu.GCCSpecsConsoleParser"/>
+      </scannerInfoProvider>
+   </extension>
 
-	<!-- Build Definitions -->
-	<extension
-			id="org.rtems.cdt.build"
-			point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
-		<configuration
-				id="org.rtems.cdt.config.base"
-				name="RTEMS Configuration"
-				cleanCommand="rm -rf"
-				artifactExtension="exe">
-			<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>
-		<toolChain
-				id="org.rtems.cdt.toolchain"
-				name="RTEMS Toolchain (UNIX)"
-				archList="all"
-				osList="linux,solaris,hpux,aix,qnx"
-				targetTool="org.rtems.cdt.c.linker;org.rtems.cdt.cpp.linker;org.rtems.cdt.archiver"
-				scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfile">
-			<targetPlatform
-				id="org.rtems.cdt.target"
-				name="RTEMS Target"
-				binaryParser="org.eclipse.cdt.core.ELF"
-				osList="all"
-				archList="all">
-			</targetPlatform>
-			<builder
-					id="org.rtems.cdt.builder"
-					superClass="cdt.managedbuild.target.gnu.builder"/>
-			<tool
-					id="org.rtems.cdt.c.compiler"
-					superClass="cdt.managedbuild.tool.gnu.c.compiler"
-					command="powerpc-rtems4.10-gcc">
-				<inputType
-						id="org.rtems.cdt.c.compiler.input"
-						superClass="cdt.managedbuild.tool.gnu.c.compiler.input"
-						scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfileC"/>
-			</tool>
-			<tool
-					id="org.rtems.cdt.cpp.compiler"
-					superClass="cdt.managedbuild.tool.gnu.cpp.compiler"
-					command="powerpc-rtems4.10-g++">
-				<inputType
-						id="org.rtems.cdt.cpp.compiler.input"
-						superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"
-						scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfileCPP"/>
-			</tool>
-			<tool
-					id="org.rtems.cdt.assembler"
-					superClass="cdt.managedbuild.tool.gnu.assembler"
-					command="powerpc-rtems4.10-as">
-			</tool>
-			<tool
-					id="org.rtems.cdt.c.linker"
-					superClass="cdt.managedbuild.tool.gnu.c.linker"
-					command="powerpc-rtems4.10-gcc">
-				<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="org.rtems.cdt.cpp.linker"
-					superClass="cdt.managedbuild.tool.gnu.cpp.linker"
-					command="powerpc-rtems4.10-g++">
-				<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="org.rtems.cdt.archiver"
-					superClass="cdt.managedbuild.tool.gnu.archiver"
-					command="powerpc-rtems4.10-ar">
-				<enablement type="ALL">
-					<checkBuildProperty
-							property="org.eclipse.cdt.build.core.buildArtefactType"
-							value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
-				</enablement>
-			</tool>
-		</toolChain>
-		<projectType
-				buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
-				id="org.rtems.cdt.project.exe"
-				name="RTEMS Executable">
-			<configuration
-					id="org.rtems.cdt.config.exe"
-					name="RTEMS Executable Configuration"
-					parent="org.rtems.cdt.config.base"
-					buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release">
-				<toolChain
-						id="org.rtems.cdt.toolchain.exe"
-						superClass="org.rtems.cdt.toolchain">
-				</toolChain>
-			</configuration>
-		</projectType>
-	</extension>
+   <!-- Build Definitions -->
+   <extension
+         id="org.rtems.cdt.build"
+         point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
+      <configuration
+            id="org.rtems.cdt.config.base"
+            name="RTEMS Configuration"
+            cleanCommand="rm -rf"
+            artifactExtension="exe">
+         <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>
+      <toolChain
+            id="org.rtems.cdt.toolchain"
+            name="RTEMS Toolchain (UNIX)"
+            archList="all"
+            osList="linux,solaris,hpux,aix,qnx"
+            targetTool="org.rtems.cdt.c.linker;org.rtems.cdt.cpp.linker;org.rtems.cdt.archiver"
+            scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfile">
+         <targetPlatform
+            id="org.rtems.cdt.target"
+            name="RTEMS Target"
+            binaryParser="org.eclipse.cdt.core.ELF"
+            osList="all"
+            archList="all">
+         </targetPlatform>
+         <builder
+               id="org.rtems.cdt.builder"
+               superClass="cdt.managedbuild.target.gnu.builder"/>
+         <tool
+               id="org.rtems.cdt.c.compiler"
+               superClass="cdt.managedbuild.tool.gnu.c.compiler"
+               command="powerpc-rtems4.10-gcc">
+            <inputType
+                  id="org.rtems.cdt.c.compiler.input"
+                  superClass="cdt.managedbuild.tool.gnu.c.compiler.input"
+                  scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfileC"/>
+         </tool>
+         <tool
+               id="org.rtems.cdt.cpp.compiler"
+               superClass="cdt.managedbuild.tool.gnu.cpp.compiler"
+               command="powerpc-rtems4.10-g++">
+            <inputType
+                  id="org.rtems.cdt.cpp.compiler.input"
+                  superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"
+                  scannerConfigDiscoveryProfileId="org.rtems.cdt.toolchain2.RtemsSCDProfileCPP"/>
+         </tool>
+         <tool
+               id="org.rtems.cdt.assembler"
+               superClass="cdt.managedbuild.tool.gnu.assembler"
+               command="powerpc-rtems4.10-as">
+         </tool>
+         <tool
+               id="org.rtems.cdt.c.linker"
+               superClass="cdt.managedbuild.tool.gnu.c.linker"
+               command="powerpc-rtems4.10-gcc">
+            <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="org.rtems.cdt.cpp.linker"
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker"
+               command="powerpc-rtems4.10-g++">
+            <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="org.rtems.cdt.archiver"
+               superClass="cdt.managedbuild.tool.gnu.archiver"
+               command="powerpc-rtems4.10-ar">
+            <enablement type="ALL">
+               <checkBuildProperty
+                     property="org.eclipse.cdt.build.core.buildArtefactType"
+                     value="org.eclipse.cdt.build.core.buildArtefactType.staticLib"/>
+            </enablement>
+         </tool>
+      </toolChain>
+      <projectType
+            buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
+            id="org.rtems.cdt.project.exe"
+            name="RTEMS Executable">
+         <configuration
+               id="org.rtems.cdt.config.exe"
+               name="RTEMS Executable Configuration"
+               parent="org.rtems.cdt.config.base"
+               buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release">
+            <toolChain
+                  id="org.rtems.cdt.toolchain.exe"
+                  superClass="org.rtems.cdt.toolchain">
+            </toolChain>
+         </configuration>
+      </projectType>
+   </extension>
 </plugin>
