# HG changeset patch
# User Jon Chatten
# Date 1267003084 0
# Node ID a888df7554c487cb0a3606b34b124cfd2d96a8ba
# Parent  27b807b5a1f530e601d34a041cfd6fcb4ea83e68# Parent  019dafe54c232457e0417c220325202581467025
Catch-up.

diff -r 019dafe54c23 -r a888df7554c4 sbsv2/raptor/lib/config/gcce.xml
--- a/sbsv2/raptor/lib/config/gcce.xml	Tue Feb 23 16:57:47 2010 +0000
+++ b/sbsv2/raptor/lib/config/gcce.xml	Wed Feb 24 09:18:04 2010 +0000
@@ -101,5 +101,25 @@
 		<set name="USER_LIBS_PATH_OPTION" value="--userlibpath"/>
 		<set name="VFE_OPTION" value=""/>
 		<set name="NO_UNALIGNED_ACCESS" value="$(CC.NO_UNALIGNED_ACCESS)"/>
+		<set name="OWN_LIBRARY_OPTION" value=""/>
+		<set name="STATIC_LIBS_LIST" value=""/>
+		<set name="ARMLIBS" value=""/>
+		<set name="CC.SOFTVFP_MAYBE_VFPV2" value="soft"/>
+		<set name="PL.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
+		<set name="CC.SOFTVFP_MAYBE_VFPV3" value="soft"/>
+		<set name="PL.SOFTVFP_MAYBE_VFPV3" value="softvfp"/>
+		<set name="CC.ARMV5" value="-march=armv5t"/>
+		<set name="CC.ARMV6" value="-march=armv6t2"/>
+		<set name="CC.ARMV7" value="-march=armv7"/>
+		<set name="RELOCATABLE_IMAGE_OPTION" value=""/>
+		<set name="RVCTLIB" value=""/>
+		<set name="CC.NO_UNALIGNED_ACCESS" value=""/>
+		<set name="SPLIT_OPTION" value=""/>
+		<set name="NEED_ENTRYPOINT_LIBRARY" value=""/>
+		<set name="RVCTBIN" value="" />
+		<set name="RVCTINC" value="" />
+		<set name="USER_STATIC_RUNTIME_LIB" value="usrt3_1.lib"/>
+		<set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt3_1.lib"/>
+		<set name="NEED_ENTRYPOINT_LIBRARY" value="" />
 	</var>
 </build>
diff -r 019dafe54c23 -r a888df7554c4 sbsv2/raptor/lib/config/variants.xml
--- a/sbsv2/raptor/lib/config/variants.xml	Tue Feb 23 16:57:47 2010 +0000
+++ b/sbsv2/raptor/lib/config/variants.xml	Wed Feb 24 09:18:04 2010 +0000
@@ -77,41 +77,24 @@
 	<var name="whatlog">
 		<set name='WHATLOG' value='TRUE'/>
 	</var>
-
+	
 	<var name="gcce4_3_2" extends="gcce_base">
 		<env name="SBS_GCCE432BIN" type="path" />
 		<set name="GCCEBIN" value="$(SBS_GCCE432BIN)" />
-		<set name="OWN_LIBRARY_OPTION" value=""/>
-		<set name="STATIC_LIBS_LIST" value=""/>
 		<set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso dfprvct3_1.dso drtrvct3_1.dso"/>
-		<set name="ARMLIBS" value=""/>
-		<set name="CC.SOFTVFP_MAYBE_VFPV2" value="soft"/>
-		<set name="PL.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
-		<set name="CC.SOFTVFP_MAYBE_VFPV3" value="soft"/>
-		<set name="PL.SOFTVFP_MAYBE_VFPV3" value="softvfp"/>
-		<set name="CC.ARMV5" value="-march=armv5t"/>
-		<set name="CC.ARMV6" value="-march=armv6t2"/>
-		<set name="CC.ARMV7" value="-march=armv7"/>
-		<set name="RELOCATABLE_IMAGE_OPTION" value=""/>
-		<set name="RVCTLIB" value=""/>
-		<set name="CC.NO_UNALIGNED_ACCESS" value=""/>
-		<set name="SPLIT_OPTION" value=""/>
-		<set name="NEED_ENTRYPOINT_LIBRARY" value=""/>
-		<set name="RVCTBIN" value="" />
-		<set name="RVCTINC" value="" />
-		<set name="USER_STATIC_RUNTIME_LIB" value="usrt3_1.lib"/>
-		<set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt3_1.lib"/>
-		<set name="NEED_ENTRYPOINT_LIBRARY" value="" />
 		<set name="PLATMACROS.VAR" value="GCCE_4 GCCE_4_3"/>
 		<set name="ARMMACROS.VAR" value="__GCCE_4__ __GCCE_4_3__"/>
 	</var>
 
-	<var name="gcce4_3_3" extends="gcce4_3_2">
+	<var name="gcce4_3_3" extends="gcce_base">
 		<env name="SBS_GCCE433BIN" type="path" />
 		<set name="GCCEBIN" value="$(SBS_GCCE433BIN)" />
+		<set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso dfprvct3_1.dso drtrvct3_1.dso"/>
+		<set name="PLATMACROS.VAR" value="GCCE_4 GCCE_4_3"/>
+		<set name="ARMMACROS.VAR" value="__GCCE_4__ __GCCE_4_3__"/>
 	</var>
 	
-	<var name="gcce4_4_1" extends="gcce4_3_3">
+	<var name="gcce4_4_1" extends="gcce_base">
 		<env name="SBS_GCCE441BIN" type="path" />
 		<set name="GCCEBIN" value="$(SBS_GCCE441BIN)" />
 		<set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso"/>