--- a/kerneltest/f32test/demandpaging/loader/t_pageldrtstdll.cia	Sun Jul 18 10:41:59 2010 +0100
+++ b/kerneltest/f32test/demandpaging/loader/t_pageldrtstdll.cia	Mon Jul 19 08:40:05 2010 +0100
@@ -32,7 +32,7 @@
 
 //#if defined(_DEBUG) || defined(_DEBUG_RELEASE)
 
-#if defined __ARMCC__ || defined __X86__
+#if defined __EABI__ || defined __X86__
 
 #ifdef __X86__
 
@@ -68,7 +68,7 @@
 #define __NAKED__
 #endif 
 
-#if defined __ARMCC__
+#if defined __EABI__
 #define ASM_OP1   asm("movs		r2,r0");
 #define ASM_OP2   asm("adds		r0,r2,r1");
 #define ASM_OP3   asm("bx		lr");
@@ -1633,12 +1633,17 @@
 
 __NAKED__ TInt TestAlignmentxXXx(TInt aParam1)
     {
-#ifdef __X86__
+#if defined(__X86__)
 	return 0;
-#else
+#elif defined(__ARMCC__)
     space    4096
     BX       lr
     ENDP
+#elif defined(__GCCE__)
+	asm(".fill 4096");
+	asm("bx lr");
+#else
+#error What compiler? 
 #endif
     }
 
@@ -1934,7 +1939,7 @@
 	}
 
 
-#endif // __ARMCC__
+#endif // __EABI__
 
 TInt CallTestFunc(TInt aParam1, TInt aParam2, TInt aIndex)
 	{

--- a/kerneltest/f32test/demandpaging/t_pagestress.cpp	Sun Jul 18 10:41:59 2010 +0100
+++ b/kerneltest/f32test/demandpaging/t_pagestress.cpp	Mon Jul 19 08:40:05 2010 +0100
@@ -974,7 +974,7 @@
 	TestPrioChange = EFalse;
 	TestMediaAccess = EFalse;
 
-#if defined __ARMCC__ || defined __X86__
+#if defined __EABI__ || defined __X86__
 	// Currently we only build aligned DLLs on ARMV5 and X86 builds.
 	TEST_NEXT((_L("Alignment Check.")));
 	RUNTEST1(CheckAlignments() == KErrNone);

--- a/kerneltest/f32test/group/bld.inf	Sun Jul 18 10:41:59 2010 +0100
+++ b/kerneltest/f32test/group/bld.inf	Mon Jul 19 08:40:05 2010 +0100
@@ -54,6 +54,7 @@
 t_fsysbm    support
 t_whet      support
 #ifdef ARMCC
+// ARMCC should become EABI if and when VFP is supported for GCCE builds.
 t_whetvfp   support
 #endif
 //T_WARM        manual