# HG changeset patch
# User Tom Cosgrove <tom.cosgrove@nokia.com>
# Date 1275060365 -3600
# Node ID 7430085980950313ea0a8f22f463611146189ddb
# Parent  5b5d147c7838846664edd74018c9e684c168c0c3
Fix for bug 2283 (RVCT 4.0 support is missing from PDK 3.0.h)
Have multiple extension sections in the bld.inf, one for each version
of the compiler.  The RVCT version building the tools will build the
runtime libraries for its version, but make sure we extract all the other
versions from zip archives.  Also add the archive for RVCT4.

diff -r 5b5d147c7838 -r 743008598095 kernel/eka/compsupp/bld.inf
--- a/kernel/eka/compsupp/bld.inf	Tue May 25 14:09:55 2010 +0300
+++ b/kernel/eka/compsupp/bld.inf	Fri May 28 16:26:05 2010 +0100
@@ -32,47 +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
 
-// Unzip RVCT3.1 runtime if being built with RVCT2.2 or RVCT4.0
+#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.
 
-start extension tools/compsupp
+    #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_2_2) || defined(ARMCC_4_0)
-option  FILE  $(EXTENSION_ROOT)/rt_3_1.zip
-#elif defined(ARMCC_3_1)
-option  FILE  $(EXTENSION_ROOT)/rt_2_2.zip
-#endif
+    #ifndef ARMCC_3_1
+        start extension tools/compsupp
+        option FILE  $(EXTENSION_ROOT)/rt_3_1.zip
+        option TODIR $(EPOCROOT)epoc32/release
+        end
+    #endif
 
-option  TODIR $(EPOCROOT)epoc32/release
-
-end
+    #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 5b5d147c7838 -r 743008598095 kernel/eka/compsupp/rt_2_2.zip
Binary file kernel/eka/compsupp/rt_2_2.zip has changed
diff -r 5b5d147c7838 -r 743008598095 kernel/eka/compsupp/rt_3_1.zip
Binary file kernel/eka/compsupp/rt_3_1.zip has changed
diff -r 5b5d147c7838 -r 743008598095 kernel/eka/compsupp/rt_4_0.zip
Binary file kernel/eka/compsupp/rt_4_0.zip has changed