diff -r 01e93f67d69f -r f0d26e1063c4 foundation_system/sf_config/sbs/s60_sbs_config.xml
--- a/foundation_system/sf_config/sbs/s60_sbs_config.xml	Wed Jun 23 10:26:26 2010 +0100
+++ b/foundation_system/sf_config/sbs/s60_sbs_config.xml	Wed Jun 23 17:36:35 2010 +0100
@@ -26,6 +26,7 @@
 		<append name="CPP_LANG_OPTION" value="-Wno-invalid-offsetof"/>		<!-- turn off "perhaps the 'offsetof' macro was used incorrectly" -->
 		<append name="CC_WARNINGS_CONTROL_OPTION" value="-Wno-attributes"/>		<!-- turn off warnings where IMPORT_C and EXPORT_C are *correctly* matched -->
 
+		<set name="AAPCS_OPTION" value="-mapcs-frame -mthumb-interwork"/>   <!-- use -mapcs-frame instead of -mapcs - see Bug 1405 -->
 		<set name="USER_STATIC_RUNTIME_LIB" value="usrt4_0.lib"/>        <!-- use the RVCT 4.0 version of the runtime support -->
 		<set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt4_0.lib"/>      <!-- use the RVCT 4.0 version of the runtime support -->
 	</var>