# HG changeset patch
# User Richard Taylor <richard.i.taylor@nokia.com>
# Date 1272971473 -3600
# Node ID 8ac72bc37dd60e177b0723788d556834a24e14f5
# Parent  54a88b895bcda3df25051d545027f60717ece845# Parent  5732243e83c12663f6102c7f0a8679c7660944fa
merge from team wip

diff -r 54a88b895bcd -r 8ac72bc37dd6 sbsv2/raptor/RELEASE-NOTES.html
--- a/sbsv2/raptor/RELEASE-NOTES.html	Tue May 04 12:08:55 2010 +0100
+++ b/sbsv2/raptor/RELEASE-NOTES.html	Tue May 04 12:11:13 2010 +0100
@@ -14,6 +14,7 @@
 <li><a href="notes/parametric_log_filters.txt">   Pass parameters to log filters from the command line </a></li>
 <li><a href="notes/delete_on_failed_compile.txt"> Work-around for failed RVCT 2.2 compiles             </a></li>
 <li><a href="notes/query_cli.txt">                Obtain configuration data using --query option       </a></li>
+<li>                                              Carbide.xml now contains *_gcce aliases                  </li>
 
 </ul>
 
diff -r 54a88b895bcd -r 8ac72bc37dd6 sbsv2/raptor/lib/config/carbide.xml
--- a/sbsv2/raptor/lib/config/carbide.xml	Tue May 04 12:08:55 2010 +0100
+++ b/sbsv2/raptor/lib/config/carbide.xml	Tue May 04 12:11:13 2010 +0100
@@ -27,6 +27,22 @@
 			<config name="armv9e_urel"/>
 			<config name="armv9e_udeb"/>
 		</config>
+		<config name="armv5_gcce" abstract="true">
+			<config name="armv5_urel_gcce"/>
+			<config name="armv5_udeb_gcce"/>
+		</config>
+		<config name="armv6_gcce" abstract="true">
+			<config name="armv6_urel_gcce"/>
+			<config name="armv6_udeb_gcce"/>
+		</config>
+		<config name="armv7_gcce" abstract="true">
+			<config name="armv7_urel_gcce"/>
+			<config name="armv7_udeb_gcce"/>
+		</config>
+		<config name="armv9e_gcce" abstract="true">
+			<config name="armv9e_urel_gcce"/>
+			<config name="armv9e_udeb_gcce"/>
+		</config>
 	</config>
 
 	<config name="winscw" abstract="true">