# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1275063066 -3600
# Node ID 23c4ec5a1df9114b6d284a4cb0f38f827ebef235
# Parent  7430085980950313ea0a8f22f463611146189ddb# Parent  70db9e7362de6f471d5350bbe8613df0580c03f9
Remerge sundry GCCE fixes, and fixes for bug 2014 and bug 2149

diff -r 70db9e7362de -r 23c4ec5a1df9 kernel/eka/compsupp/bld.inf
--- a/kernel/eka/compsupp/bld.inf	Fri May 28 15:21:37 2010 +0100
+++ b/kernel/eka/compsupp/bld.inf	Fri May 28 17:11:06 2010 +0100
@@ -32,57 +32,62 @@
 
 PRJ_MMPFILES
 
-#if !defined GCCXML && !defined GCCE
+#if !defined(GCCXML) && !defined(GCCE)
 
     symcpp/scppnwdl.mmp
     rvct/dfprvct-thunk.mmp
     rvct/usrt.mmp
     rvct/ksrt.mmp
 
-    #ifndef SMP // Only static libraries build for SMP.
+    #ifndef SMP // Don't build dynamic libraries for SMP.
 
-    rvct/drtaeabi.mmp
+        rvct/drtaeabi.mmp
 
-    rvct/dfpaeabi.mmp
-    rvct/dfpaeabi_vfpv2.mmp
+        rvct/dfpaeabi.mmp
+        rvct/dfpaeabi_vfpv2.mmp
 
-    #if defined(ARMCC_2_2) || defined(ARMCC_3_1)
+        #if defined(ARMCC_2_2) || defined(ARMCC_3_1)
 
-        rvct/drtrvct.mmp
-        rvct/drtrvct_vfpv2.mmp
+            rvct/drtrvct.mmp
+            rvct/drtrvct_vfpv2.mmp
+
+            rvct/dfprvct.mmp
+            rvct/dfprvct_vfpv2.mmp
 
-        rvct/dfprvct.mmp
-        rvct/dfprvct_vfpv2.mmp
-    #endif
+        #endif
 
-    #endif
+    #endif // #ifndef SMP
+
+#endif // #if !defined(GCCXML) && !defined(GCCE)
+
 
 PRJ_EXTENSIONS
 
-// Export the compiler-specific support files built by this component
-// when using the other versions of RVCT
+#if !defined(GCCXML) && !defined(GCCE)
+
+    // We need the runtime libraries for all versions of the compiler.
+    // The version we're running with will build its own runtime library;
+    // we need to extract the other versions from archives.
 
-#if !defined(ARMCC_2_2)
-start extension tools/compsupp
-option  FILE  $(EXTENSION_ROOT)/rt_2_2_export.zip
-option  TODIR $(EPOCROOT)
-end
-#endif
+    #ifndef ARMCC_2_2
+        start extension tools/compsupp
+        option FILE  $(EXTENSION_ROOT)/rt_2_2.zip
+        option TODIR $(EPOCROOT)epoc32/release
+        end
+    #endif
 
-#if !defined(ARMCC_3_1)
-start extension tools/compsupp
-option  FILE  $(EXTENSION_ROOT)/rt_3_1_export.zip
-option  TODIR $(EPOCROOT)
-end
-#endif
+    #ifndef ARMCC_3_1
+        start extension tools/compsupp
+        option FILE  $(EXTENSION_ROOT)/rt_3_1.zip
+        option TODIR $(EPOCROOT)epoc32/release
+        end
+    #endif
 
-#if !defined(ARMCC_4_0)
-start extension tools/compsupp
-option  FILE  $(EXTENSION_ROOT)/rt_4_0_export.zip
-option  TODIR $(EPOCROOT)
-end
-#endif
+    #ifndef ARMCC_4_0
+        start extension tools/compsupp
+        option FILE  $(EXTENSION_ROOT)/rt_4_0.zip
+        option TODIR $(EPOCROOT)epoc32/release
+        end
+    #endif
 
-#endif // #if !defined GCCXML && !defined GCCE
-
-
+#endif // #if !defined(GCCXML) && !defined(GCCE)
diff -r 70db9e7362de -r 23c4ec5a1df9 kernel/eka/compsupp/rt_2_2.zip
Binary file kernel/eka/compsupp/rt_2_2.zip has changed
diff -r 70db9e7362de -r 23c4ec5a1df9 kernel/eka/compsupp/rt_2_2_export.zip
Binary file kernel/eka/compsupp/rt_2_2_export.zip has changed
diff -r 70db9e7362de -r 23c4ec5a1df9 kernel/eka/compsupp/rt_3_1.zip
Binary file kernel/eka/compsupp/rt_3_1.zip has changed
diff -r 70db9e7362de -r 23c4ec5a1df9 kernel/eka/compsupp/rt_3_1_export.zip
Binary file kernel/eka/compsupp/rt_3_1_export.zip has changed
diff -r 70db9e7362de -r 23c4ec5a1df9 kernel/eka/compsupp/rt_4_0.zip
Binary file kernel/eka/compsupp/rt_4_0.zip has changed
diff -r 70db9e7362de -r 23c4ec5a1df9 kernel/eka/compsupp/rt_4_0_export.zip
Binary file kernel/eka/compsupp/rt_4_0_export.zip has changed