# HG changeset patch
# User mikek
# Date 1276625970 -3600
# Node ID 72699c76850aa25ac6927ddba6eeb570a5b18441
# Parent  12b6722e77538387dce11e06092d9bba0daa6592# Parent  eafca448bc3713ba808a4d44bfc443a9900d5bf9
Merge to Symbian repo

diff -r 12b6722e7753 -r 72699c76850a kernel/eka/common/des16.cpp
--- a/kernel/eka/common/des16.cpp	Tue Jun 15 19:10:20 2010 +0100
+++ b/kernel/eka/common/des16.cpp	Tue Jun 15 19:19:30 2010 +0100
@@ -2013,7 +2013,7 @@
 */
 	{
 	__ASSERT_ALWAYS(aMaxLength>=0,Panic(ETDes16MaxLengthNegative));
-	return new(STD_CLASS::Alloc(_FOFF(HBufC16,iBuf[aMaxLength]))) HBufC16(0);
+	return new(STD_CLASS::Alloc(_FOFF_DYNAMIC(HBufC16,iBuf[aMaxLength]))) HBufC16(0);
 	}
 
 EXPORT_C HBufC16 *HBufC16::NewL(TInt aMaxLength)
@@ -2092,7 +2092,7 @@
 */
 	{
 	__ASSERT_ALWAYS(aMaxLength>=0,Panic(ETDes16MaxLengthNegative));
-	return new(STD_CLASS::Alloc(_FOFF(HBufC16,iBuf[aMaxLength]))) HBufC16(aMaxLength);
+	return new(STD_CLASS::Alloc(_FOFF_DYNAMIC(HBufC16,iBuf[aMaxLength]))) HBufC16(aMaxLength);
 	}
 
 EXPORT_C HBufC16 *HBufC16::NewMaxL(TInt aMaxLength)
diff -r 12b6722e7753 -r 72699c76850a kernel/eka/common/des8.cpp
--- a/kernel/eka/common/des8.cpp	Tue Jun 15 19:10:20 2010 +0100
+++ b/kernel/eka/common/des8.cpp	Tue Jun 15 19:19:30 2010 +0100
@@ -978,7 +978,7 @@
 */
 	{
 	__ASSERT_ALWAYS(aMaxLength>=0,Panic(ETDes8MaxLengthNegative));
-	return new(STD_CLASS::Alloc(_FOFF(HBufC8,iBuf[aMaxLength]))) HBufC8(0);
+	return new(STD_CLASS::Alloc(_FOFF_DYNAMIC(HBufC8,iBuf[aMaxLength]))) HBufC8(0);
 	}
 
 EXPORT_C HBufC8 *HBufC8::NewL(TInt aMaxLength)
@@ -1057,7 +1057,7 @@
 */
 	{
 	__ASSERT_ALWAYS(aMaxLength>=0,Panic(ETDes8MaxLengthNegative));
-	return new(STD_CLASS::Alloc(_FOFF(HBufC8,iBuf[aMaxLength]))) HBufC8(aMaxLength);
+	return new(STD_CLASS::Alloc(_FOFF_DYNAMIC(HBufC8,iBuf[aMaxLength]))) HBufC8(aMaxLength);
 	}
 
 EXPORT_C HBufC8 *HBufC8::NewMaxL(TInt aMaxLength)
diff -r 12b6722e7753 -r 72699c76850a kernel/eka/compsupp/bld.inf
--- a/kernel/eka/compsupp/bld.inf	Tue Jun 15 19:10:20 2010 +0100
+++ b/kernel/eka/compsupp/bld.inf	Tue Jun 15 19:19:30 2010 +0100
@@ -29,15 +29,6 @@
 
 compsupp.iby                /epoc32/rom/include/
 
-#if defined(GCCE)
-// Workaround for GCCE builds
-// Export the generic binaries which are currently only built with RVCT
-
-:zip rt_generic_export.zip
-:zip rt_3_1_export.zip
-#endif
-
-
 PRJ_MMPFILES
 
 #if !defined GCCXML
diff -r 12b6722e7753 -r 72699c76850a kernel/eka/compsupp/gcce/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/kernel/eka/compsupp/gcce/bld.inf	Tue Jun 15 19:19:30 2010 +0100
@@ -0,0 +1,33 @@
+// Copyright (c) 2010 Symbian Foundation Ltd
+// This component and the accompanying materials are made available
+// under the terms of the License "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Symbian Foundation Ltd - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// GCC runtime support
+// 
+//
+
+PRJ_PLATFORMS
+
+ARMV5
+
+
+PRJ_EXPORTS
+
+// Workaround for GCCE builds
+// Export the generic binaries which are currently only built with RVCT
+
+:zip ..\rt_generic_export.zip
+:zip ..\rt_3_1_export.zip
+
+PRJ_MMPFILES
+
+// none - (yet)
+
diff -r 12b6722e7753 -r 72699c76850a kernel/eka/kernel/arm/cache_maintenancev7.cia
--- a/kernel/eka/kernel/arm/cache_maintenancev7.cia	Tue Jun 15 19:10:20 2010 +0100
+++ b/kernel/eka/kernel/arm/cache_maintenancev7.cia	Tue Jun 15 19:19:30 2010 +0100
@@ -72,11 +72,11 @@
 	__JUMP(,lr);
 
 	asm("__DCacheInfoPoU: ");
-	asm(".word %a0" : : "i" ((TInt)&InternalCache::Info[KCacheInfoD_PoU]));
+	asm(".word %a0" : : "i" (&InternalCache::Info[KCacheInfoD_PoU]));
 	asm("__DCacheInfoPoC: ");
-	asm(".word %a0" : : "i" ((TInt)&InternalCache::Info[KCacheInfoD]));
+	asm(".word %a0" : : "i" (&InternalCache::Info[KCacheInfoD]));
 	asm("__ICacheInfo: ");
-	asm(".word %a0" : : "i" ((TInt)&InternalCache::Info[KCacheInfoI]));
+	asm(".word %a0" : : "i" (&InternalCache::Info[KCacheInfoI]));
 	}
 
 __NAKED__ void InternalCache::IMB_CacheLine(TLinAddr /*aAddr*/)
diff -r 12b6722e7753 -r 72699c76850a kernel/eka/kernel/arm/ckernel.cia
diff -r 12b6722e7753 -r 72699c76850a kernel/eka/kernel/sprocess.cpp
--- a/kernel/eka/kernel/sprocess.cpp	Tue Jun 15 19:10:20 2010 +0100
+++ b/kernel/eka/kernel/sprocess.cpp	Tue Jun 15 19:19:30 2010 +0100
@@ -32,7 +32,7 @@
 DProcess::DProcess()
 	: iPriority(EProcPriorityForeground),
 	  iExitType((TUint8)EExitPending), iGeneration(1), iFlags(KProcessFlagJustInTime),
-	  iDynamicCode(8, _FOFF(SCodeSegEntry, iSeg), 2*256)
+	  iDynamicCode(8, (TInt)_FOFF(SCodeSegEntry, iSeg), 2*256)
 	{
 	//reserve slot 0 for later use for the command line
 	iEnvironmentData[0] = EBinaryData;
diff -r 12b6722e7753 -r 72699c76850a kernel/eka/nkern/arm/ncsched.cia
--- a/kernel/eka/nkern/arm/ncsched.cia	Tue Jun 15 19:10:20 2010 +0100
+++ b/kernel/eka/nkern/arm/ncsched.cia	Tue Jun 15 19:19:30 2010 +0100
@@ -1760,11 +1760,11 @@
 	SET_THUMB2EE_HNDLR_BASE(,r1);			
 #endif
 #ifdef __CPU_HAS_CP15_THREAD_ID_REG
-	SET_RWRW_TID(,r3)						// restore Thread ID from r3
+	SET_RWRW_TID(,r3);						// restore Thread ID from r3
 #endif 
 	asm("mov r3, r2 ");						// r3=TheCurrentThread
 #ifdef __CPU_HAS_COPROCESSOR_ACCESS_REG
-	SET_CAR(,r10)
+	SET_CAR(,r10);
 #endif
 #ifdef __CPU_ARM_USE_DOMAINS
 	asm("mcr p15, 0, r11, c3, c0, 0 ");