# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1279813526 -3600
# Node ID 6341186e950be66f50bbd25f4662e3e283ef43bc
# Parent  02f8866cac877c82428e5b54ca24ee54b96fb44b# Parent  865e95be13c29da9f9d3b1ae5e02a3b65fb8135b
Catchup to latest Symbian^4

diff -r 865e95be13c2 -r 6341186e950b foundation_system/sf_config/config/inc/bldpublic.hrh
--- a/foundation_system/sf_config/config/inc/bldpublic.hrh	Tue Jul 13 16:56:21 2010 +0100
+++ b/foundation_system/sf_config/config/inc/bldpublic.hrh	Thu Jul 22 16:45:26 2010 +0100
@@ -2146,4 +2146,5 @@
 */
 #define __XDM_XCAP                                         
 
-#endif // __BLDPUBLIC_HRH 
\ No newline at end of file
+#endif // __BLDPUBLIC_HRH 
+
diff -r 865e95be13c2 -r 6341186e950b foundation_system/sf_config/sbs/s60_sbs_config.xml
--- a/foundation_system/sf_config/sbs/s60_sbs_config.xml	Tue Jul 13 16:56:21 2010 +0100
+++ b/foundation_system/sf_config/sbs/s60_sbs_config.xml	Thu Jul 22 16:45:26 2010 +0100
@@ -21,7 +21,14 @@
 	<!-- gnu make -->
 	<alias name="make" meaning="make_engine.make_changes"/>
 
-	<var name="permissive">
-		<append name="CC_ERRORS_CONTROL_OPTION" value="-fpermissive"/>
+	<var name="surge">
+		<append name="CPP_LANG_OPTION" value="-fpermissive"/>   <!-- downgrade "extra qualification XXX on member YYY" errors to warnings -->
+		<append name="CPP_LANG_OPTION" value="-Wno-invalid-offsetof"/>    <!-- turn off "perhaps the 'offsetof' macro was used incorrectly" -->
+		<append name="CPP_LANG_OPTION" value="-Wno-psabi"/>		            <!-- turn off " mangling of 'va_list' has changedin GCC 4.4" -->
+		<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>
 </build>