diff -r 8f7f130ac31a -r 2afef616d2a1 kernel/eka/include/e32cia.h
--- a/kernel/eka/include/e32cia.h	Mon Jun 21 21:52:32 2010 +0100
+++ b/kernel/eka/include/e32cia.h	Tue Jun 22 15:09:12 2010 +0100
@@ -472,18 +472,18 @@
 #define CSM_Z26Des16PanicLengthOutOfRangev " Des16PanicLengthOutOfRange__Fv"
 #define CSM_Z20Des8PanicDesOverflowv " Des8PanicDesOverflow__Fv"
 #define CSM_ZN10RArrayBase4GrowEv " Grow__10RArrayBase"
-#define CSM_ZN3Mem8CompareCEPKtiS0_i " CompareC__3MemPCUsiT1i"
+#define CSM_ZN3Mem8CompareCEPKtiS1_i " CompareC__3MemPCUsiT1i"
 #define CSM_Z20Des16PanicBadDesTypev " Des16PanicBadDesType__Fv"
 #define CSM_Z24Des16PanicLengthNegativev " Des16PanicLengthNegative__Fv"
 #define CSM_Z19Des8PanicBadDesTypev " Des8PanicBadDesType__Fv"
-#define CSM_ZN3Mem7CompareEPKtiS0_i " Compare__3MemPCUsiT1i"
+#define CSM_ZN3Mem7CompareEPKtiS1_i " Compare__3MemPCUsiT1i"
 #define CSM_Z23Des8PanicLengthNegativev " Des8PanicLengthNegative__Fv"
 #define CSM_ZN17RPointerArrayBase4GrowEv " Grow__17RPointerArrayBase"
 #define CSM_Z28Des16PanicDesIndexOutOfRangev " Des16PanicDesIndexOutOfRange__Fv"
-#define CSM_ZN3Mem8CompareFEPKhiS0_i " CompareF__3MemPCUciT1i"
+#define CSM_ZN3Mem8CompareFEPKhiS1_i " CompareF__3MemPCUciT1i"
 #define CSM_Z5Panic9TCdtPanic " Panic__F9TCdtPanic"
 #define CSM_Z27Des8PanicDesIndexOutOfRangev " Des8PanicDesIndexOutOfRange__Fv"
-#define CSM_ZN3Mem8CompareFEPKtiS0_i " CompareF__3MemPCUsiT1i"
+#define CSM_ZN3Mem8CompareFEPKtiS1_i " CompareF__3MemPCUsiT1i"
 #define CSM_Z26Des8PanicMaxLengthNegativev " Des8PanicMaxLengthNegative__Fv"
 #define CSM_Z25Des8PanicLengthOutOfRangev " Des8PanicLengthOutOfRange__Fv"
 #define CSM_Z21Des16PanicDesOverflowv " Des16PanicDesOverflow__Fv"
@@ -491,7 +491,7 @@
 #define CSM_Z18PanicBadArrayIndexv " PanicBadArrayIndex__Fv"
 #define CSM_Z22Des8PanicPosOutOfRangev " Des8PanicPosOutOfRange__Fv"
 #define CSM_Z23Des16PanicPosOutOfRangev " Des16PanicPosOutOfRange__Fv"
-#define CSM_ZN3Mem8CompareCEPKhiS0_i " CompareC__3MemPCUciT1i"
+#define CSM_ZN3Mem8CompareCEPKhiS1_i " CompareC__3MemPCUciT1i"
 #define CSM_Z22RHeap_PanicBadNextCellv " RHeap_PanicBadNextCell__Fv"
 #define CSM_Z30PanicEWordMoveSourceNotAlignedv " PanicEWordMoveSourceNotAligned__Fv"
 #define CSM_Z30PanicEWordMoveTargetNotAlignedv " PanicEWordMoveTargetNotAligned__Fv"
@@ -505,18 +505,18 @@
 #define CSM_Z26Des16PanicLengthOutOfRangev " __cpp(Des16PanicLengthOutOfRange)"
 #define CSM_Z20Des8PanicDesOverflowv " __cpp(Des8PanicDesOverflow)"
 #define CSM_ZN10RArrayBase4GrowEv " __cpp(RArrayBase::Grow)"
-#define CSM_ZN3Mem8CompareCEPKtiS0_i " __cpp(static_cast<int (*) (const unsigned short*, int, const unsigned short*, int)>(&Mem::CompareC))"
+#define CSM_ZN3Mem8CompareCEPKtiS1_i " __cpp(static_cast<int (*) (const unsigned short*, int, const unsigned short*, int)>(&Mem::CompareC))"
 #define CSM_Z20Des16PanicBadDesTypev " __cpp(Des16PanicBadDesType)"
 #define CSM_Z24Des16PanicLengthNegativev " __cpp(Des16PanicLengthNegative)"
 #define CSM_Z19Des8PanicBadDesTypev " __cpp(Des8PanicBadDesType)"
-#define CSM_ZN3Mem7CompareEPKtiS0_i " __cpp(static_cast<int (*) (const unsigned short*, int, const unsigned short*, int)>(&Mem::Compare))"
+#define CSM_ZN3Mem7CompareEPKtiS1_i " __cpp(static_cast<int (*) (const unsigned short*, int, const unsigned short*, int)>(&Mem::Compare))"
 #define CSM_Z23Des8PanicLengthNegativev " __cpp(Des8PanicLengthNegative)"
 #define CSM_ZN17RPointerArrayBase4GrowEv " __cpp(RPointerArrayBase::Grow)"
 #define CSM_Z28Des16PanicDesIndexOutOfRangev " __cpp(Des16PanicDesIndexOutOfRange)"
-#define CSM_ZN3Mem8CompareFEPKhiS0_i " __cpp(static_cast<int (*) (const unsigned char*, int, const unsigned char*, int)>(&Mem::CompareF))"
+#define CSM_ZN3Mem8CompareFEPKhiS1_i " __cpp(static_cast<int (*) (const unsigned char*, int, const unsigned char*, int)>(&Mem::CompareF))"
 #define CSM_Z5Panic9TCdtPanic " __cpp(Panic)"
 #define CSM_Z27Des8PanicDesIndexOutOfRangev " __cpp(Des8PanicDesIndexOutOfRange)"
-#define CSM_ZN3Mem8CompareFEPKtiS0_i " __cpp(static_cast<int (*) (const unsigned short*, int, const unsigned short*, int)>(&Mem::CompareF))"
+#define CSM_ZN3Mem8CompareFEPKtiS1_i " __cpp(static_cast<int (*) (const unsigned short*, int, const unsigned short*, int)>(&Mem::CompareF))"
 #define CSM_Z26Des8PanicMaxLengthNegativev " __cpp(Des8PanicMaxLengthNegative)"
 #define CSM_Z25Des8PanicLengthOutOfRangev " __cpp(Des8PanicLengthOutOfRange)"
 #define CSM_Z21Des16PanicDesOverflowv " __cpp(Des16PanicDesOverflow)"
@@ -524,7 +524,7 @@
 #define CSM_Z18PanicBadArrayIndexv " __cpp(PanicBadArrayIndex)"
 #define CSM_Z22Des8PanicPosOutOfRangev " __cpp(Des8PanicPosOutOfRange)"
 #define CSM_Z23Des16PanicPosOutOfRangev " __cpp(Des16PanicPosOutOfRange)"
-#define CSM_ZN3Mem8CompareCEPKhiS0_i " __cpp(static_cast<int (*) (const unsigned char*, int, const unsigned char*, int)>(&Mem::CompareC))"
+#define CSM_ZN3Mem8CompareCEPKhiS1_i " __cpp(static_cast<int (*) (const unsigned char*, int, const unsigned char*, int)>(&Mem::CompareC))"
 #define CSM_Z22RHeap_PanicBadNextCellv " __cpp(RHeap_PanicBadNextCell)"
 #define CSM_Z30PanicEWordMoveSourceNotAlignedv " __cpp(PanicEWordMoveSourceNotAligned)"
 #define CSM_Z30PanicEWordMoveTargetNotAlignedv " __cpp(PanicEWordMoveTargetNotAligned)"
@@ -537,18 +537,18 @@
 #define CSM_Z26Des16PanicLengthOutOfRangev " _Z26Des16PanicLengthOutOfRangev"
 #define CSM_Z20Des8PanicDesOverflowv " _Z20Des8PanicDesOverflowv"
 #define CSM_ZN10RArrayBase4GrowEv " _ZN10RArrayBase4GrowEv"
-#define CSM_ZN3Mem8CompareCEPKtiS0_i " _ZN3Mem8CompareCEPKtiS0_i"
+#define CSM_ZN3Mem8CompareCEPKtiS1_i " _ZN3Mem8CompareCEPKtiS1_i"
 #define CSM_Z20Des16PanicBadDesTypev " _Z20Des16PanicBadDesTypev"
 #define CSM_Z24Des16PanicLengthNegativev " _Z24Des16PanicLengthNegativev"
 #define CSM_Z19Des8PanicBadDesTypev " _Z19Des8PanicBadDesTypev"
-#define CSM_ZN3Mem7CompareEPKtiS0_i " _ZN3Mem7CompareEPKtiS0_i"
+#define CSM_ZN3Mem7CompareEPKtiS1_i " _ZN3Mem7CompareEPKtiS1_i"
 #define CSM_Z23Des8PanicLengthNegativev " _Z23Des8PanicLengthNegativev"
 #define CSM_ZN17RPointerArrayBase4GrowEv " _ZN17RPointerArrayBase4GrowEv"
 #define CSM_Z28Des16PanicDesIndexOutOfRangev " _Z28Des16PanicDesIndexOutOfRangev"
-#define CSM_ZN3Mem8CompareFEPKhiS0_i " _ZN3Mem8CompareFEPKhiS0_i"
+#define CSM_ZN3Mem8CompareFEPKhiS1_i " _ZN3Mem8CompareFEPKhiS1_i" 
 #define CSM_Z5Panic9TCdtPanic " _Z5Panic9TCdtPanic"
 #define CSM_Z27Des8PanicDesIndexOutOfRangev " _Z27Des8PanicDesIndexOutOfRangev"
-#define CSM_ZN3Mem8CompareFEPKtiS0_i " _ZN3Mem8CompareFEPKtiS0_i"
+#define CSM_ZN3Mem8CompareFEPKtiS1_i " _ZN3Mem8CompareFEPKtiS1_i"
 #define CSM_Z26Des8PanicMaxLengthNegativev " _Z26Des8PanicMaxLengthNegativev"
 #define CSM_Z25Des8PanicLengthOutOfRangev " _Z25Des8PanicLengthOutOfRangev"
 #define CSM_Z21Des16PanicDesOverflowv " _Z21Des16PanicDesOverflowv"
@@ -556,7 +556,7 @@
 #define CSM_Z18PanicBadArrayIndexv " _Z18PanicBadArrayIndexv"
 #define CSM_Z22Des8PanicPosOutOfRangev " _Z22Des8PanicPosOutOfRangev"
 #define CSM_Z23Des16PanicPosOutOfRangev " _Z23Des16PanicPosOutOfRangev"
-#define CSM_ZN3Mem8CompareCEPKhiS0_i " _ZN3Mem8CompareCEPKhiS0_i"
+#define CSM_ZN3Mem8CompareCEPKhiS1_i " _ZN3Mem8CompareCEPKhiS1_i"
 #define CSM_Z22RHeap_PanicBadNextCellv " _Z22RHeap_PanicBadNextCellv"
 #define CSM_Z30PanicEWordMoveSourceNotAlignedv " _Z30PanicEWordMoveSourceNotAlignedv"
 #define CSM_Z30PanicEWordMoveTargetNotAlignedv " _Z30PanicEWordMoveTargetNotAlignedv"