--- a/kernel/eka/common/des16.cpp	Tue Jun 15 13:29:38 2010 +0100
+++ b/kernel/eka/common/des16.cpp	Tue Jun 15 16:21:40 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)

--- a/kernel/eka/common/des8.cpp	Tue Jun 15 13:29:38 2010 +0100
+++ b/kernel/eka/common/des8.cpp	Tue Jun 15 16:21:40 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)

--- a/kernel/eka/kernel/arm/cache_maintenancev7.cia	Tue Jun 15 13:29:38 2010 +0100
+++ b/kernel/eka/kernel/arm/cache_maintenancev7.cia	Tue Jun 15 16:21:40 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*/)

--- a/kernel/eka/kernel/arm/ckernel.cia	Tue Jun 15 13:29:38 2010 +0100
+++ b/kernel/eka/kernel/arm/ckernel.cia	Tue Jun 15 16:21:40 2010 +0100
@@ -271,7 +271,7 @@
 	asm(".word TheScheduler ");
 #endif
 	asm("__IpcExcHandler: ");
-	asm(".word %a0" : : "i" ((TInt)DThread::IpcExcHandler));
+	asm(".word %a0" : : "i" (&DThread::IpcExcHandler));
 	asm("__default_exc_trap_handler: ");
 	asm("mov r1, #%a0" : : "i" ((TInt)KErrBadDescriptor));	// r0 already contains pointer to TExcTrap
 	// fall through

--- a/kernel/eka/kernel/sprocess.cpp	Tue Jun 15 13:29:38 2010 +0100
+++ b/kernel/eka/kernel/sprocess.cpp	Tue Jun 15 16:21:40 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;

--- a/kernel/eka/nkern/arm/ncsched.cia	Tue Jun 15 13:29:38 2010 +0100
+++ b/kernel/eka/nkern/arm/ncsched.cia	Tue Jun 15 16:21:40 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 ");