diff -r f70b728ea30c -r a1925fb7753a sbsv2/raptor/lib/flm/standard.xml
--- a/sbsv2/raptor/lib/flm/standard.xml	Wed Jul 28 13:20:46 2010 +0100
+++ b/sbsv2/raptor/lib/flm/standard.xml	Thu Aug 12 09:00:16 2010 +0100
@@ -12,6 +12,7 @@
 		<param name='CAPABILITY'/>
 		<param name='COMPRESSTARGET' default=''/>
 		<param name='CPPONLYOPTION' default='-E'/>
+		<param name='DOCUMENT' default=''/>
 		<param name='LIBRARY'/>
 		<param name='LIBRARY_DEBUG'/>
 		<param name='LINKAS' default=''/>
@@ -26,6 +27,7 @@
 		<param name='LISTING_OPTION' default='-S'/>
 		<param name='MMPDEFS' default=''/>
 		<param name='NOCOMPRESSTARGET' default=''/>
+		<param name='POSTLINKER_SUPPORTS_ASMTYPE' default=''/>
 		<param name='POSTLINKER_SUPPORTS_WDP' default=''/>
 		<param name='PAGED' default=''/>
 		<param name='PAGEDCODE_OPTION' default='default'/>
@@ -75,9 +77,11 @@
 		<param name='CC.VAL.SOFTVFP_MAYBE_VFPV2' default=''/>
 		<param name='CODE_SEGMENT_START' default=''/>
 		<param name='TOOLCHAIN' default=''/>
+		<param name='TRACES' default=''/>
 		<param name='USE_RVCT22_DELETE_WORKAROUND' default=''/>
 	</interface>
 	<interface name="Symbian.e32abiv2" extends="Symbian.mmp" flm="e32abiv2.flm">
+		<param name='BASE_ARCH' default=''/>
 		<param name='SUPPORTS_STDCPP_NEWLIB' default='1'/>
 		<param name='HAS_DEDICATED_OP_NEWDEL_LIB' default='1'/>
 		<param name='DEFAULT_STDCPP_NEWLIB'/>
@@ -92,7 +96,6 @@
 		<param name='CC_WARNINGS_CONTROL_OPTION'/>
 		<param name='CDEFS'/>
 		<param name='CIADEFS'/>
-		<param name='CFLAGS'/>
 		<param name='COMMANDFILE_OPTION'/>
 		<param name='COMPILE_ONLY_OPTION'/>
 		<param name='COMPILER_FPU_DEFAULT'/>
@@ -109,11 +112,12 @@
 		<param name='CREATEVMAPCPP'/>
 		<param name='DEBUG_FORMAT'/>
 		<param name='DEBUG_INFO'/>
+		<param name='DEFGENTOOL'/>
 		<param name='DEPEND_OPTION'/>
-		<param name='ELF2E32'/>
 		<param name='EFREEZE'/>
 		<param name='EFREEZE_REMOVE_OPTION' default=''/>
 		<param name='ENUM_OPTION'/>
+		<param name='ENTRYPOINT' default=''/>
 		<param name='EXCEPTIONS'/>
 		<param name='NO_EXCEPTIONS'/>
 		<param name='EXPORT_VTBL_OPTION'/>
@@ -121,14 +125,17 @@
 		<param name='FEATUREVARIANT' default=''/>
 		<param name='FEATUREVARIANTNAME' default=''/>
 		<param name='FEATUREVARIANTSAFE' default=''/>
+		<param name='FIX_EXPORTS_USING_EXP_FILE'/>
 		<param name='FPMODE_OPTION'/>
 		<param name='FROMELF'/>
 		<param name='FULLVARIANTPATH'/>
+		<param name='IMPLIBTOOL'/>
+		<param name='IMPLIB_EXTENSION'/>
 		<param name='RVCT3_1' default=''/>
 		<param name='LD'/>
 		<param name='LD_ERRORS_CONTROL_OPTION'/>
 		<param name='LD_WARNINGS_CONTROL_OPTION'/>
-		<param name='LD_WARNINGS_SUPPRESSION_ARMLIBS' default='' />
+		<param name='LD_WARNINGS_SUPPRESSION_ARMLIBS' default=''/>
 		<param name='LIBPATH'/>
 		<param name='LICENSERETRY_OPTION' default=''/>
 		<param name='LINKER_ADD_STATIC_RUNTIME'/>
@@ -136,6 +143,7 @@
 		<param name='LINKER_DEFAULT_LIBS'/>
 		<param name='LINKER_DEFAULT_LIB_PATHS'/>
 		<param name='LINKER_ENTRY_OPTION'/>
+		<param name='LINKER_ENTRYPOINT_PREFIX'/>
 		<param name='LINKER_GROUP_START_OPTION'/>
 		<param name='LINKER_GROUP_END_OPTION'/>
 		<param name='LINKER_MISC_FLAGS'/>		
@@ -149,16 +157,20 @@
 		<param name='PERL'/>
 		<param name='PERTURBSTARTTIME'/>
 		<param name='PERTURBMSECS' default='500'/>
+		<param name='POSTLINKER'/>
+		<param name='POSTLINKER_ASM_OPTION' default='' />
 		<param name='POSTLINKER_COMPRESSION_DEFAULT'/>
 		<param name='POSTLINKER_FPU_DEFAULT'/>
 		<param name='POSTLINKER_FPU_MAPPING'/>
 		<param name='PREPDEF'/>
+		<param name='PREPDEF_ENTRYPOINT_PREFIX' default='_'/>
 		<param name='PREINCLUDE'/>
 		<param name='PREINCLUDE_OPTION'/>
 		<param name='PREPROCESSOR_OPTION'/>
 		<param name='RANSLEEP'/>
 		<param name='RELEASEPATH'/>
 		<param name='RESOLVED_DEFFILE'/>
+		<param name='RESOLVED_DEFFILE_SECONDARY'/>
 		<param name='RUNTIME_LIBS_LIST'/>
 		<param name='RUNTIME_LIBS_PATH'/>
 		<param name='RUNTIME_SYMBOL_VISIBILITY_OPTION'/>
@@ -174,6 +186,7 @@
 		<param name='SHARED_OBJECT_OPTION'/>
 		<param name='SO_NAME_OPTION'/>
 		<param name='SPLIT_OPTION'/>
+		<param name='TREAT_EXES_AS_SHARED'/>		
 		<param name='KERNEL_STATIC_RUNTIME_LIB'/>
 		<param name='USER_STATIC_RUNTIME_LIB'/>
 		<param name='USER_STATIC_RUNTIME_LIB_NESTED_EXCEPTIONS'/>
@@ -205,24 +218,29 @@
 		<param name='EXPLICITVERSION' default=''/>
 	</interface>
 	<interface name="Symbian.exe" extends="Symbian.e32abiv2" flm="e32abiv2exe.flm">
+		<param name='ENTRYPOINT' default="E32Startup"/>
 		<param name='TARGETTYPE' default="exe"/>
 		<param name='UID1' default="1000007a"/>
 	</interface>
 	<interface name="Symbian.stdexe" extends="Symbian.e32abiv2" flm="e32abiv2stdexe.flm">
+		<param name='ENTRYPOINT' default="E32Startup"/>
 		<param name='TARGETTYPE' default="stdexe"/>
 		<param name='UID1' default="1000007a"/>
 		<param name='UID2' default="20004c45"/>
 		<param name='WCHARENTRYPOINT' default=""/>
 	</interface>
 	<interface name="Symbian.dll" extends="Symbian.e32abiv2" flm="e32abiv2dll.flm">
+		<param name='ENTRYPOINT' default="E32Dll"/>
 		<param name='TARGETTYPE' default="dll"/>
 		<param name='UID1' default="10000079"/>
 	</interface>
 	<interface name="Symbian.pdll" extends="Symbian.e32abiv2" flm="e32abiv2pdll.flm">
+		<param name='ENTRYPOINT' default="E32Dll"/>
 		<param name='TARGETTYPE' default="pdll"/>
 		<param name='UID1' default="10000079"/>
 	</interface>
 	<interface name="Symbian.stddll" extends="Symbian.e32abiv2" flm="e32abiv2stddll.flm">
+		<param name='ENTRYPOINT' default="E32Dll"/>
 		<param name='TARGETTYPE' default="stddll"/>
 		<param name='UID1' default="10000079"/>
 		<param name='UID2' default="20004c45"/>