Select correct DEF file for GCCE builds, and remove obsolete eabi deffiles which were used instead - bug 2965 GCC_SURGE
authorWilliam Roberts <williamr@symbian.org>
Wed, 23 Jun 2010 22:58:50 +0100
branchGCC_SURGE
changeset 38 61516c5786af
parent 37 6adf287e479c
child 49 00076e39386f
Select correct DEF file for GCCE builds, and remove obsolete eabi deffiles which were used instead - bug 2965
commonservices/PlatformEnv/group/PlatformEnv.mmp
dosservices/dosserver/eabi/dossrvu.def
dosservices/dosserver/eabi/dsclientdosu.def
dosservices/dosserver/eabi/dsclientu.def
dosservices/dosserver/group/dosserverdll.mmp
dosservices/dosserver/group/dsclient.mmp
dosservices/dosserver/group/dsclientdos.mmp
--- a/commonservices/PlatformEnv/group/PlatformEnv.mmp	Mon Jun 21 22:42:53 2010 +0100
+++ b/commonservices/PlatformEnv/group/PlatformEnv.mmp	Wed Jun 23 22:58:50 2010 +0100
@@ -47,7 +47,7 @@
 
 LANG        SC
 
-#if defined(ARMCC)
+#if defined(EABI)
 deffile ../EABI/PlatformEnvCenRep.DEF
 #elif defined( WINSCW )
 deffile ../bwinscw/PLATFORMENVCENREP.DEF 
--- a/dosservices/dosserver/eabi/dossrvu.def	Mon Jun 21 22:42:53 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-EXPORTS
-	_ZN10CDosServer11ThreadStartERNS_7TSignalE @ 1 NONAME
-	_ZN11CDosMtcBase13GetStateFlagLER13TDosStateFlag @ 2 NONAME
-	_ZN11CDosMtcBase13SetStateFlagLE13TDosStateFlag @ 3 NONAME
-	_ZN11CDosMtcBase14ResetGenerateLEv @ 4 NONAME
-	_ZN11CDosMtcBase15ExecuteMessageLERK9RMessage2 @ 5 NONAME
-	_ZN11CDosMtcBase16DosShutdownSyncLEv @ 6 NONAME
-	_ZN11CDosMtcBase8DosSyncLEv @ 7 NONAME
-	_ZN11CDosMtcBase8PowerOnLEv @ 8 NONAME
-	_ZN11CDosMtcBase9PowerOffLEv @ 9 NONAME
-	_ZN11CDosMtcBase9SetStateLEi @ 10 NONAME
-	_ZN11CDosSaeBase15ExecuteMessageLERK9RMessage2 @ 11 NONAME
-	_ZN11CDosSaeBase9StartSaeLEv @ 12 NONAME
-	_ZN14CDosHelperBase12HiddenResetLEv @ 13 NONAME
-	_ZN14CDosHelperBase13GetRTCStatusLERi @ 14 NONAME
-	_ZN14CDosHelperBase15ExecuteMessageLERK9RMessage2 @ 15 NONAME
-	_ZN14CDosHelperBase17GetStartupReasonLERi @ 16 NONAME
-	_ZN14CDosHelperBase18GenerateGripEventLEv @ 17 NONAME
-	_ZN14CDosHelperBase19GetSWStartupReasonLERs @ 18 NONAME
-	_ZN14CDosHelperBase19SetSWStartupReasonLEs @ 19 NONAME
-	_ZN16CDosEventManager10FaxMessageEi @ 20 NONAME
-	_ZN16CDosEventManager10SimChangedEi @ 21 NONAME
-	_ZN16CDosEventManager12EmailMessageEi @ 22 NONAME
-	_ZN16CDosEventManager12GeneralEventElPvi @ 23 NONAME
-	_ZN16CDosEventManager12PhonePowerOnEv @ 24 NONAME
-	_ZN16CDosEventManager12SecurityCodeE21EPSSecurityCodeStatus @ 25 NONAME
-	_ZN16CDosEventManager13SimLockStatusE16EPSSimLockStatus @ 26 NONAME
-	_ZN16CDosEventManager15VoiceMailStatusE18EPSVoiceMailStatus @ 27 NONAME
-	_ZN16CDosEventManager20NotifySelfTestStatusEi @ 28 NONAME
-	_ZN16CDosEventManager21CallsForwardingStatusE24EPSCallsForwardingStatus @ 29 NONAME
-	_ZN16CDosEventManager21CurrentSimOwnedStatusE27EPSCurrentSimOwnedSimStatus @ 30 NONAME
-	_ZN16CDosEventManager22DoMtcInitiatedShutdownEv @ 31 NONAME
-	_ZN16CDosEventManager23SimPresentStateChangedLE19TDosSimPresentState @ 32 NONAME
-	_ZN16CDosEventManager23SmsStorageStatusChangedE20TDosSmsStorageStatus @ 33 NONAME
-	_ZN16CDosEventManager8SimReadyE17EPSSimReadyStatus @ 34 NONAME
-	_ZN16CDosEventManager8SimStateE12TDosSimState @ 35 NONAME
-	_ZN16CDosSelfTestBase15ExecuteMessageLERK9RMessage2 @ 36 NONAME
-	_ZN16CDosSelfTestBase16PerformSelfTestLEv @ 37 NONAME
-	_ZN16CDosSysUtilsBase12SetDosAlarmLEP5TTime @ 38 NONAME
-	_ZN16CDosSysUtilsBase14PerformDosRfsLEj12RMessagePtr2 @ 39 NONAME
-	_ZN16CDosSysUtilsBase15ExecuteMessageLERK9RMessage2 @ 40 NONAME
-	_ZN16CDosSysUtilsBase15GetSimLanguageLERi @ 41 NONAME
-	_ZN17CDosAsyncExecBase13AfterCompleteERi @ 42 NONAME
-	_ZN17CDosAsyncExecBase14BeforeCompleteERi @ 43 NONAME
-	_ZN17CDosAsyncExecBase4RunLEv @ 44 NONAME
-	_ZN17CDosAsyncExecBase8DoCancelEv @ 45 NONAME
-	_ZN17CDosAsyncExecBaseC1E12RMessagePtr2 @ 46 NONAME
-	_ZN17CDosAsyncExecBaseC2E12RMessagePtr2 @ 47 NONAME
-	_ZN17CDosAsyncExecBaseD0Ev @ 48 NONAME
-	_ZN17CDosAsyncExecBaseD1Ev @ 49 NONAME
-	_ZN17CDosAsyncExecBaseD2Ev @ 50 NONAME
-	_ZN17CDosExtensionBase15ExecuteMessageLERK9RMessage2 @ 51 NONAME
-	_ZN18CDosSharedDataBase15ExecuteMessageLERK9RMessage2 @ 52 NONAME
-	_ZN18CDosSharedDataBase4NewLEP29CSharedDataFileSystemNotifier @ 53 NONAME
-	_ZN18CDosSharedDataBase5NewLCEP29CSharedDataFileSystemNotifier @ 54 NONAME
-	_ZNK17CDosExtensionBase15CompleteRequestERK9RMessage2iPvii @ 55 NONAME
-	_ZTI10CDosServer @ 56 NONAME ; #<TI>#
-	_ZTI11CDosMtcBase @ 57 NONAME ABSENT ; #<TI>#
-	_ZTI11CDosSaeBase @ 58 NONAME ABSENT ; #<TI>#
-	_ZTI14CDosHelperBase @ 59 NONAME ABSENT ; #<TI>#
-	_ZTI16CDosSelfTestBase @ 60 NONAME ABSENT ; #<TI>#
-	_ZTI16CDosSysUtilsBase @ 61 NONAME ABSENT ; #<TI>#
-	_ZTI17CDosAsyncExecBase @ 62 NONAME ; #<TI>#
-	_ZTI17CDosExtensionBase @ 63 NONAME ; #<TI>#
-	_ZTI17CEventManagerBase @ 64 NONAME ; #<TI>#
-	_ZTI18CDosSharedDataBase @ 65 NONAME ; #<TI>#
-	_ZTV10CDosServer @ 66 NONAME ; #<VT>#
-	_ZTV11CDosMtcBase @ 67 NONAME ABSENT ; #<VT>#
-	_ZTV11CDosSaeBase @ 68 NONAME ABSENT ; #<VT>#
-	_ZTV14CDosHelperBase @ 69 NONAME ABSENT ; #<VT>#
-	_ZTV16CDosSelfTestBase @ 70 NONAME ABSENT ; #<VT>#
-	_ZTV16CDosSysUtilsBase @ 71 NONAME ABSENT ; #<VT>#
-	_ZTV17CDosAsyncExecBase @ 72 NONAME ; #<VT>#
-	_ZTV17CDosExtensionBase @ 73 NONAME ; #<VT>#
-	_ZTV17CEventManagerBase @ 74 NONAME ; #<VT>#
-	_ZTV18CDosSharedDataBase @ 75 NONAME ; #<VT>#
-	_ZThn32_N11CDosMtcBase13GetStateFlagLER13TDosStateFlag @ 76 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N11CDosMtcBase13SetStateFlagLE13TDosStateFlag @ 77 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N11CDosMtcBase14ResetGenerateLEv @ 78 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N11CDosMtcBase16DosShutdownSyncLEv @ 79 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N11CDosMtcBase8DosSyncLEv @ 80 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N11CDosMtcBase8PowerOnLEv @ 81 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N11CDosMtcBase9PowerOffLEv @ 82 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N11CDosMtcBase9SetStateLEi @ 83 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N11CDosSaeBase9StartSaeLEv @ 84 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N14CDosHelperBase12HiddenResetLEv @ 85 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N14CDosHelperBase13GetRTCStatusLERi @ 86 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N14CDosHelperBase17GetStartupReasonLERi @ 87 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N14CDosHelperBase18GenerateGripEventLEv @ 88 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N14CDosHelperBase19GetSWStartupReasonLERs @ 89 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N14CDosHelperBase19SetSWStartupReasonLEs @ 90 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N16CDosSelfTestBase16PerformSelfTestLEv @ 91 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N16CDosSysUtilsBase12SetDosAlarmLEP5TTime @ 92 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N16CDosSysUtilsBase14PerformDosRfsLEj12RMessagePtr2 @ 93 NONAME ABSENT ; #<thunk>#
-	_ZThn32_N16CDosSysUtilsBase15GetSimLanguageLERi @ 94 NONAME ABSENT ; #<thunk>#
-
--- a/dosservices/dosserver/eabi/dsclientdosu.def	Mon Jun 21 22:42:53 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-EXPORTS
-	_ZN15CDosEventSender10FaxMessageEi @ 1 NONAME
-	_ZN15CDosEventSender10SimChangedEi @ 2 NONAME
-	_ZN15CDosEventSender12EmailMessageEi @ 3 NONAME
-	_ZN15CDosEventSender12GeneralEventElPvi @ 4 NONAME
-	_ZN15CDosEventSender12PhonePowerOnEv @ 5 NONAME
-	_ZN15CDosEventSender12SecurityCodeE21EPSSecurityCodeStatus @ 6 NONAME
-	_ZN15CDosEventSender13SimLockStatusE16EPSSimLockStatus @ 7 NONAME
-	_ZN15CDosEventSender15VoiceMailStatusE18EPSVoiceMailStatus @ 8 NONAME
-	_ZN15CDosEventSender20NotifySelfTestStatusEi @ 9 NONAME
-	_ZN15CDosEventSender21CallsForwardingStatusE24EPSCallsForwardingStatus @ 10 NONAME
-	_ZN15CDosEventSender21CurrentSimOwnedStatusE27EPSCurrentSimOwnedSimStatus @ 11 NONAME
-	_ZN15CDosEventSender22DoMtcInitiatedShutdownEv @ 12 NONAME
-	_ZN15CDosEventSender23SimPresentStateChangedLE19TDosSimPresentState @ 13 NONAME
-	_ZN15CDosEventSender23SmsStorageStatusChangedE20TDosSmsStorageStatus @ 14 NONAME
-	_ZN15CDosEventSender4NewLER10RDosServer @ 15 NONAME
-	_ZN15CDosEventSender4NewLEv @ 16 NONAME
-	_ZN15CDosEventSender8SimReadyE17EPSSimReadyStatus @ 17 NONAME
-	_ZN15CDosEventSender8SimStateE12TDosSimState @ 18 NONAME
-	_ZN15CDosEventSenderD0Ev @ 19 NONAME
-	_ZN15CDosEventSenderD1Ev @ 20 NONAME
-	_ZN15CDosEventSenderD2Ev @ 21 NONAME
-	_ZTI15CDosEventSender @ 22 NONAME ; #<TI>#
-	_ZTV15CDosEventSender @ 23 NONAME ; #<VT>#
-
--- a/dosservices/dosserver/eabi/dsclientu.def	Mon Jun 21 22:42:53 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-EXPORTS
-	_ZN10RDosHelper4OpenER10RDosServer @ 1 NONAME
-	_ZN10RDosServer5CloseEv @ 2 NONAME
-	_ZN10RDosServer7ConnectEv @ 3 NONAME
-	_ZN12RDosSelfTest4OpenER10RDosServer @ 4 NONAME
-	_ZN12RDosSysUtils4OpenER10RDosServer @ 5 NONAME
-	_ZN13RDosExtension12CallFunctionER14TRequestStatusRK8TPckgBufI13TExtensionParER5TDes8 @ 6 NONAME
-	_ZN13RDosExtension12CallFunctionERK8TPckgBufI13TExtensionParER5TDes8 @ 7 NONAME
-	_ZN13RDosExtension12CallFunctionEiPvii @ 8 NONAME
-	_ZN13RDosExtension4OpenER10RDosServer @ 9 NONAME
-	_ZN14RDosSharedData4OpenER10RDosServer @ 10 NONAME
-	_ZN14RDosSharedData5CloseEv @ 11 NONAME
-	_ZN14RDosSubSession5CloseEv @ 12 NONAME
-	_ZN21CDosEventListenerBase11FaxMessageLEi @ 13 NONAME
-	_ZN21CDosEventListenerBase11SimChangedLEi @ 14 NONAME
-	_ZN21CDosEventListenerBase13EmailMessageLEi @ 15 NONAME
-	_ZN21CDosEventListenerBase13GeneralEventLERK14TRegisterEventPv @ 16 NONAME
-	_ZN21CDosEventListenerBase13PhonePowerOnLEv @ 17 NONAME
-	_ZN21CDosEventListenerBase13SecurityCodeLE21EPSSecurityCodeStatus @ 18 NONAME
-	_ZN21CDosEventListenerBase14SimLockStatusLE16EPSSimLockStatus @ 19 NONAME
-	_ZN21CDosEventListenerBase15StartListeningLEP14TRegisterEventi @ 20 NONAME
-	_ZN21CDosEventListenerBase15StartListeningLEji10TQueueType @ 21 NONAME
-	_ZN21CDosEventListenerBase16VoiceMailStatusLE18EPSVoiceMailStatus @ 22 NONAME
-	_ZN21CDosEventListenerBase21NotifySelfTestStatusLEi @ 23 NONAME
-	_ZN21CDosEventListenerBase22CallsForwardingStatusLE24EPSCallsForwardingStatus @ 24 NONAME
-	_ZN21CDosEventListenerBase22CurrentSimOwnedStatusLE27EPSCurrentSimOwnedSimStatus @ 25 NONAME
-	_ZN21CDosEventListenerBase23DoMtcInitiatedShutdownLEv @ 26 NONAME
-	_ZN21CDosEventListenerBase23SimPresentStateChangedLE19TDosSimPresentState @ 27 NONAME
-	_ZN21CDosEventListenerBase24SmsStorageStatusChangedLE20TDosSmsStorageStatus @ 28 NONAME
-	_ZN21CDosEventListenerBase4StopEv @ 29 NONAME
-	_ZN21CDosEventListenerBase7OnErrorEiRi @ 30 NONAME
-	_ZN21CDosEventListenerBase9SimReadyLE17EPSSimReadyStatus @ 31 NONAME
-	_ZN21CDosEventListenerBase9SimStateLE12TDosSimState @ 32 NONAME
-	_ZN21CDosEventListenerBaseC1ER10RDosServer @ 33 NONAME
-	_ZN21CDosEventListenerBaseC1Ev @ 34 NONAME
-	_ZN21CDosEventListenerBaseC2ER10RDosServer @ 35 NONAME
-	_ZN21CDosEventListenerBaseC2Ev @ 36 NONAME
-	_ZN21CDosEventListenerBaseD0Ev @ 37 NONAME
-	_ZN21CDosEventListenerBaseD1Ev @ 38 NONAME
-	_ZN21CDosEventListenerBaseD2Ev @ 39 NONAME
-	_ZN7RDosMtc12GetStateFlagER13TDosStateFlag @ 40 NONAME
-	_ZN7RDosMtc4OpenER10RDosServer @ 41 NONAME
-	_ZN7RDosSae4OpenER10RDosServer @ 42 NONAME
-	_ZNK10RDosHelper11HiddenResetEv @ 43 NONAME
-	_ZNK10RDosHelper12GetRTCStatusERi @ 44 NONAME
-	_ZNK10RDosHelper16GetStartupReasonERi @ 45 NONAME
-	_ZNK10RDosHelper17GenerateGripEventEv @ 46 NONAME
-	_ZNK10RDosHelper18GetSWStartupReasonERs @ 47 NONAME
-	_ZNK10RDosHelper18SetSWStartupReasonEs @ 48 NONAME
-	_ZNK10RDosServer11StartServerEv @ 49 NONAME
-	_ZNK10RDosServer14ServerShutdownEv @ 50 NONAME
-	_ZNK12RDosSelfTest15PerformSelfTestEv @ 51 NONAME
-	_ZNK12RDosSysUtils11SetDosAlarmEP5TTime @ 52 NONAME
-	_ZNK12RDosSysUtils13PerformDosRfsEjR14TRequestStatus @ 53 NONAME
-	_ZNK12RDosSysUtils14GetSimLanguageERi @ 54 NONAME
-	_ZNK14RDosSharedData20RequestFreeDiskSpaceEi @ 55 NONAME
-	_ZNK14RDosSharedData26RequestFreeDiskSpaceCancelEv @ 56 NONAME
-	_ZNK7RDosMtc12SetStateFlagE13TDosStateFlag @ 57 NONAME
-	_ZNK7RDosMtc13ResetGenerateEv @ 58 NONAME
-	_ZNK7RDosMtc15DosShutdownSyncEv @ 59 NONAME
-	_ZNK7RDosMtc7DosSyncEv @ 60 NONAME
-	_ZNK7RDosMtc7PowerOnEv @ 61 NONAME
-	_ZNK7RDosMtc8PowerOffEv @ 62 NONAME
-	_ZNK7RDosMtc8SetStateEi @ 63 NONAME
-	_ZNK7RDosSae8StartSaeEv @ 64 NONAME
-	_ZTI17CDosEventNotifier @ 65 NONAME ; #<TI>#
-	_ZTI21CDosEventListenerBase @ 66 NONAME ; #<TI>#
-	_ZTV17CDosEventNotifier @ 67 NONAME ; #<VT>#
-	_ZTV21CDosEventListenerBase @ 68 NONAME ; #<VT>#
-
--- a/dosservices/dosserver/group/dosserverdll.mmp	Mon Jun 21 22:42:53 2010 +0100
+++ b/dosservices/dosserver/group/dosserverdll.mmp	Wed Jun 23 22:58:50 2010 +0100
@@ -26,7 +26,7 @@
 CAPABILITY      CAP_GENERAL_DLL NetworkControl
 
 
-#if defined( ARMCC )
+#if defined( EABI )
     deffile ../eabi/startup_flag/dossrv.DEF
 #elif defined( WINSCW )
     deffile ../bwins/startup_flag/dossrv.DEF
--- a/dosservices/dosserver/group/dsclient.mmp	Mon Jun 21 22:42:53 2010 +0100
+++ b/dosservices/dosserver/group/dsclient.mmp	Wed Jun 23 22:58:50 2010 +0100
@@ -26,7 +26,7 @@
 
 CAPABILITY      CAP_CLIENT_DLL
 
-#if defined( ARMCC )
+#if defined( EABI )
     deffile ../eabi/startup_flag/dsclient.DEF
 #elif defined( WINSCW )
     deffile ../bwins/startup_flag/dsclient.DEF
--- a/dosservices/dosserver/group/dsclientdos.mmp	Mon Jun 21 22:42:53 2010 +0100
+++ b/dosservices/dosserver/group/dsclientdos.mmp	Wed Jun 23 22:58:50 2010 +0100
@@ -26,7 +26,7 @@
 
 CAPABILITY      CAP_CLIENT_DLL
 
-#if defined( ARMCC )
+#if defined( EABI )
     deffile ../eabi/startup_flag/dsclientdos.DEF
 #elif defined( WINSCW )
     deffile ../bwins/startup_flag/dsclientdos.DEF