# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1267121221 0
# Node ID 0177236e043f27f3f5505753da6f64ceeab0ee96
# Parent  9954707c32ddba01e9332bb5282dbd237e89d7f2# Parent  566d0998560d9a815b351223f1562a64e7e2be84
Merge Compiler Compatibility fixes onto default branch.

diff -r 9954707c32dd -r 0177236e043f kernel/eka/kernel/arm/d_entry.cpp
--- a/kernel/eka/kernel/arm/d_entry.cpp	Fri Feb 05 16:17:15 2010 +0000
+++ b/kernel/eka/kernel/arm/d_entry.cpp	Thu Feb 25 18:07:01 2010 +0000
@@ -49,11 +49,11 @@
 	return KernelModuleEntry(aReason);
 	}
 
-#elif defined(__ARMCC__)
+#elif defined(__EABI__)
 
 void __DLL_Export_Table__(void);
 void __cpp_initialize__aeabi_(void);
-__weak void run_static_dtors(void);
+__WEAK__ void run_static_dtors(void);
 
 GLDEF_C TInt _E32Dll_Body(TInt aReason)
 //
diff -r 9954707c32dd -r 0177236e043f kernel/eka/kernel/arm/k_entry.cia
--- a/kernel/eka/kernel/arm/k_entry.cia	Fri Feb 05 16:17:15 2010 +0000
+++ b/kernel/eka/kernel/arm/k_entry.cia	Thu Feb 25 18:07:01 2010 +0000
@@ -71,7 +71,7 @@
 	asm("__CtorList: ");
 	asm(".word __CTOR_LIST__ ");
 	}
-#elif defined(__ARMCC__)
+#elif defined(__EABI__)
 void __DLL_Export_Table__(void);
 void __cpp_initialize__aeabi_();
   
@@ -80,7 +80,7 @@
 void __record_needed_destruction (void * d){}
 // 2.1 calls __aeabi_atexit passing __dso_handle. This can be a dummy (i.e. just a label)
 
-__asm void __dso_handle(void) {}
+__NAKED__ void __dso_handle(void) {}
 void __aeabi_atexit(void *object, void (*dtor)(void *), void *handle){}
 
 void _E32Startup_Body(TLinAddr aRomHeader, TLinAddr aSuperPage);
diff -r 9954707c32dd -r 0177236e043f kernel/eka/kernel/arm/l_entry.cia
--- a/kernel/eka/kernel/arm/l_entry.cia	Fri Feb 05 16:17:15 2010 +0000
+++ b/kernel/eka/kernel/arm/l_entry.cia	Thu Feb 25 18:07:01 2010 +0000
@@ -19,7 +19,7 @@
 
 extern "C" {
 
-#if defined(__ARMCC__)
+#if defined(__EABI__)
 void __DLL_Export_Table__(void);
 #endif
 
diff -r 9954707c32dd -r 0177236e043f kernel/eka/kernel/arm/v_entry.cpp
--- a/kernel/eka/kernel/arm/v_entry.cpp	Fri Feb 05 16:17:15 2010 +0000
+++ b/kernel/eka/kernel/arm/v_entry.cpp	Thu Feb 25 18:07:01 2010 +0000
@@ -46,7 +46,7 @@
 	return KErrGeneral;
 	}
 
-#elif defined(__ARMCC__)
+#elif defined(__EABI__)
 
 void __DLL_Export_Table__(void);
 void __cpp_initialize__aeabi_();
@@ -55,7 +55,7 @@
 // needs destruction. But kernel side static objects will never need this so, define it as a nop
 void __record_needed_destruction (void * d){}
 // 2.1 calls __aeabi_atexit passing __dso_handle. This can just be a label since its not used
-__asm void __dso_handle(void) {}
+__NAKED__ void __dso_handle(void) {}
 void __aeabi_atexit(void *object, void (*dtor)(void *), void *handle){}
 
 GLDEF_C TInt _E32Dll_Body(TInt aReason)
diff -r 9954707c32dd -r 0177236e043f kernel/eka/kernel/arm/x_entry.cpp
--- a/kernel/eka/kernel/arm/x_entry.cpp	Fri Feb 05 16:17:15 2010 +0000
+++ b/kernel/eka/kernel/arm/x_entry.cpp	Thu Feb 25 18:07:01 2010 +0000
@@ -41,7 +41,7 @@
 	return KernelModuleEntry(aReason);
 	}
 
-#elif defined(__ARMCC__)
+#elif defined(__EABI__)
 
 void __DLL_Export_Table__(void);
 void __cpp_initialize__aeabi_();
@@ -50,7 +50,7 @@
 // needs destruction. But the kernel never will need this so, define it as a nop
 void __record_needed_destruction (void * d){}
 // 2.1 calls __aeabi_atexit passing __dso_handle. This can just be a label since its not used.
-__asm void __dso_handle(void){}
+__NAKED__ void __dso_handle(void){}
 void __aeabi_atexit(void *object, void (*dtor)(void *), void *handle){}
 
 GLDEF_C TInt _E32Dll_Body(TInt aReason)
diff -r 9954707c32dd -r 0177236e043f userlibandfileserver/fileserver/sfile/sf_func.h
--- a/userlibandfileserver/fileserver/sfile/sf_func.h	Fri Feb 05 16:17:15 2010 +0000
+++ b/userlibandfileserver/fileserver/sfile/sf_func.h	Thu Feb 25 18:07:01 2010 +0000
@@ -918,7 +918,7 @@
 public:
 	static TInt Initialise(CFsRequest* aRequest);
 	static TInt DoRequestL(CFsRequest* aRequest);
-#ifndef __GCC32__ // GCC does not like AddFsToCompositeMountL() being private 
+#ifndef __GCC32__  || __GCCE__// GCC does not like AddFsToCompositeMountL() being private 
 private:
 #endif
 	static void AddFsToCompositeMountL(TInt aDriveNumber, CFileSystem& aFileSystem, TInt aLocalDriveNumber);