# HG changeset patch
# User hgs
# Date 1281019337 -19800
# Node ID e5d77a29bdca414ee47e4c8aafe808a7b5bdc6a8
# Parent  ab61c4cedc64d1d25cfe0c724af17f7fcc0b134f
201029

diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cppstdlib/bwins/libstdcppv5u.def
--- a/genericopenlibs/cppstdlib/bwins/libstdcppv5u.def	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cppstdlib/bwins/libstdcppv5u.def	Thu Aug 05 20:12:17 2010 +0530
@@ -461,4 +461,6 @@
 	?what@__Named_exception@std@@UBEPBDXZ @ 460 NONAME ; char const * std::__Named_exception::what(void) const
 	?xalloc@ios_base@std@@SAHXZ @ 461 NONAME ; int std::ios_base::xalloc(void)
 	?nothrow@std@@3Unothrow_t@1@B @ 462 NONAME ; struct std::nothrow_t const std::nothrow
-	
+	?backend_allocate@@YAPAXI@Z @ 463 NONAME ; void * backend_allocate(unsigned int)
+	?backend_free@@YAXPAX@Z @ 464 NONAME ; void backend_free(void *)
+
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def
--- a/genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def	Thu Aug 05 20:12:17 2010 +0530
@@ -204,7 +204,7 @@
 	_ZNSt10istrstreamD0Ev @ 203 NONAME
 	_ZNSt10istrstreamD1Ev @ 204 NONAME
 	_ZNSt10istrstreamD2Ev @ 205 NONAME
-	_ZNSt10istrstreamD9Ev @ 206 NONAME
+	_ZNSt10istrstreamD9Ev @ 206 NONAME ABSENT
 	_ZNSt10moneypunctIcLb0EE16GetFacetLocaleIdEv @ 207 NONAME
 	_ZNSt10moneypunctIcLb0EEC1Ej @ 208 NONAME
 	_ZNSt10moneypunctIcLb0EEC2Ej @ 209 NONAME
@@ -238,7 +238,7 @@
 	_ZNSt10ostrstreamD0Ev @ 237 NONAME
 	_ZNSt10ostrstreamD1Ev @ 238 NONAME
 	_ZNSt10ostrstreamD2Ev @ 239 NONAME
-	_ZNSt10ostrstreamD9Ev @ 240 NONAME
+	_ZNSt10ostrstreamD9Ev @ 240 NONAME ABSENT
 	_ZNSt11logic_errorD0Ev @ 241 NONAME
 	_ZNSt11logic_errorD1Ev @ 242 NONAME
 	_ZNSt11logic_errorD2Ev @ 243 NONAME
@@ -510,7 +510,7 @@
 	_ZNSt9strstreamD0Ev @ 509 NONAME
 	_ZNSt9strstreamD1Ev @ 510 NONAME
 	_ZNSt9strstreamD2Ev @ 511 NONAME
-	_ZNSt9strstreamD9Ev @ 512 NONAME
+	_ZNSt9strstreamD9Ev @ 512 NONAME ABSENT
 	_ZSt16_get_Locale_implPSt12_Locale_impl @ 513 NONAME
 	_ZSt23__stl_throw_range_errorPKc @ 514 NONAME
 	_ZSt24__stl_throw_length_errorPKc @ 515 NONAME
@@ -776,5 +776,6 @@
 	_ZNK9stlp_priv9_Messages6do_getEiiiRKSs @ 775 NONAME
 	_ZNK9stlp_priv9_Messages7do_openERKSsRKSt6locale @ 776 NONAME
 	_ZNK9stlp_priv9_Messages8do_closeEi @ 777 NONAME
-	
+	_Z12backend_freePv @ 778 NONAME
+	_Z16backend_allocatej @ 779 NONAME
 
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cppstdlib/eabi/libstdcppv5u.def
--- a/genericopenlibs/cppstdlib/eabi/libstdcppv5u.def	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cppstdlib/eabi/libstdcppv5u.def	Thu Aug 05 20:12:17 2010 +0530
@@ -776,5 +776,6 @@
 	_ZNK9stlp_priv9_Messages6do_getEiiiRKSs @ 775 NONAME
 	_ZNK9stlp_priv9_Messages7do_openERKSsRKSt6locale @ 776 NONAME
 	_ZNK9stlp_priv9_Messages8do_closeEi @ 777 NONAME
+	_Z12backend_freePv @ 778 NONAME
+	_Z16backend_allocatej @ 779 NONAME
 
-
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cppstdlib/group/libstdcpp.mmp
--- a/genericopenlibs/cppstdlib/group/libstdcpp.mmp	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cppstdlib/group/libstdcpp.mmp	Thu Aug 05 20:12:17 2010 +0530
@@ -88,6 +88,8 @@
 LIBRARY           libpthread.lib
 LIBRARY           libm.lib
 LIBRARY           euser.lib
+LIBRARY		  backend.lib
+
 
 #ifdef ARMCC_3_1
 DEFFILE			 ../eabi/libstdcppv5.def
@@ -343,3 +345,4 @@
 /* End of file */
 
 SMPSAFE
+PAGED
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cppstdlib/stl/src/allocators.cpp
--- a/genericopenlibs/cppstdlib/stl/src/allocators.cpp	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/src/allocators.cpp	Thu Aug 05 20:12:17 2010 +0530
@@ -52,8 +52,47 @@
 #define _S_free_per_thread_states	get_S_free_per_thread_states()
 #define _S_key						get_S_key()
 #define _S_key_initialized			get_S_key_initialized()
+#endif
+
+#ifdef __SYMBIAN32__
+extern "C"
+{
+IMPORT_C void* BackendAlloc(size_t );
+IMPORT_C void BackendFree(void* );
+}
 
 
+EXPORT_C void* backend_allocate(size_t __n)
+    {
+    for (;;)
+        {
+        void* p = BackendAlloc(__n);
+
+        if (p)
+            {
+            return p; 
+            }
+        
+        // set_new_handler uses Dll::Tls. So only this threads new handler will be changed
+        // for the time it is set back. No problems for other threads.
+        std::new_handler nh_func  = std::set_new_handler(NULL);
+        std::set_new_handler(nh_func);
+
+        if (nh_func)
+            {
+            nh_func();
+            }
+        else
+            {
+            __THROW(std::bad_alloc());
+            }
+        }
+    }
+
+EXPORT_C void  backend_free(void* __p)
+    {
+    BackendFree(__p);
+    }
 #endif
 
 #if defined (__WATCOMC__)
@@ -84,8 +123,13 @@
 inline void* __stlp_chunk_malloc(size_t __bytes) { _STLP_CHECK_NULL_ALLOC(_STLP_VENDOR_CSTD::malloc(__bytes)); }
 inline void __stlp_chunck_free(void* __p) { _STLP_VENDOR_CSTD::free(__p); }
 #  else
-inline void* __stlp_chunk_malloc(size_t __bytes) { return _STLP_STD::__stl_new(__bytes); }
-inline void __stlp_chunck_free(void* __p) { _STLP_STD::__stl_delete(__p); }
+inline void* __stlp_chunk_malloc(size_t __bytes) {
+    return _STLP_STD::__stl_new(__bytes);
+}
+inline void __stlp_chunck_free(void* __p) {
+    _STLP_STD::__stl_delete(__p);     
+}
+ 
 #  endif
 #endif  // !_DEBUG
 
@@ -173,7 +217,13 @@
 
 #define _STLP_NFREELISTS 16
 
-#if defined (_STLP_LEAKS_PEDANTIC) && defined (_STLP_USE_DYNAMIC_LIB)
+/*
+ * On Symbian, the stlport is built as a dll and also dynamically linked against 
+ * by the applications. The _STLP_USE_DYNAMIC_LIB should always be defined.
+ * _STLP_LEAKS_PEDANTIC is defined to prevent the memory leaks in __node_alloc 
+ * when the library is dynamically loaded and unloaded.
+ */
+#if defined (_STLP_LEAKS_PEDANTIC) && ( defined (_STLP_USE_DYNAMIC_LIB) || defined (__SYMBIAN32__) )
 /*
  * We can only do cleanup of the node allocator memory pool if we are
  * sure that the STLport library is used as a shared one as it guaranties
@@ -498,7 +548,8 @@
   _S_chunks = 0;
   _S_start_free = _S_end_free = 0;
   _S_heap_size = 0;
-  memset(__REINTERPRET_CAST(char*, &_S_free_list[0]), 0, _STLP_NFREELISTS * sizeof(_Obj*));
+  // Reinterprest cast cant remove volatileness. So using C style cast
+  memset((char*)(&_S_free_list[0]), 0, _STLP_NFREELISTS * sizeof(_Obj*));
 }
 #  endif /* _STLP_DO_CLEAN_NODE_ALLOC */
 
@@ -714,7 +765,9 @@
 #if defined (_STLP_DO_CLEAN_NODE_ALLOC)
 struct __node_alloc_cleaner {
   ~__node_alloc_cleaner()
-  { __node_alloc_impl::_S_dealloc_call(); }
+      {
+      __node_alloc_impl::_S_dealloc_call(); 
+      }
 };
 
 #  if defined (_STLP_USE_LOCK_FREE_IMPLEMENTATION)
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cppstdlib/stl/stlport/stl/_new.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_new.h	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_new.h	Thu Aug 05 20:12:17 2010 +0530
@@ -138,14 +138,34 @@
 #    define _STLP_CHECK_NULL_ALLOC(__x) return __x
 #  endif
 
+#ifdef __SYMBIAN32__
+IMPORT_C void* backend_allocate(size_t);
+IMPORT_C void  backend_free(void*);
+#endif
+
+
 _STLP_BEGIN_NAMESPACE
 
 #  if ((defined (__IBMCPP__) || defined (__OS400__) || defined (__xlC__) || defined (qTidyHeap)) && defined (__DEBUG_ALLOC__))
 inline void* _STLP_CALL __stl_new(size_t __n)   { _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n, __FILE__, __LINE__)); }
 inline void  _STLP_CALL __stl_delete(void* __p) { ::operator delete(__p, __FILE__, __LINE__); }
 #  else
-inline void* _STLP_CALL __stl_new(size_t __n)   { _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n)); }
-inline void  _STLP_CALL __stl_delete(void* __p) { ::operator delete(__p); }
+inline void* _STLP_CALL __stl_new(size_t __n)
+    {
+#ifdef __SYMBIAN32__
+    return backend_allocate(__n);
+#else
+    _STLP_CHECK_NULL_ALLOC(::operator _STLP_NEW(__n));
+#endif
+    }
+inline void  _STLP_CALL __stl_delete(void* __p)
+    {
+#ifdef __SYMBIAN32__
+    backend_free(__p);
+#else
+    ::operator delete(__p);
+#endif
+    }
 #  endif
 _STLP_END_NAMESPACE
 
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cppstdlib/stl/stlport/stl/config/host.h
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/config/host.h	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/config/host.h	Thu Aug 05 20:12:17 2010 +0530
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
 /*
  * This file defines site configuration.
  */
@@ -125,9 +109,9 @@
  * its internal memory pool but only if STLport is used as a dynamic library
  * under Win32 (using MSVC like compilers).
  */
-/*
+
 #define _STLP_LEAKS_PEDANTIC 1
-*/
+
 
 /*
  * Uncomment _STLP_USE_NEWALLOC to force allocator<T> to use plain "new"
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cstdlib/UCRT/ECRT0.CPP
--- a/genericopenlibs/cstdlib/UCRT/ECRT0.CPP	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cstdlib/UCRT/ECRT0.CPP	Thu Aug 05 20:12:17 2010 +0530
@@ -33,8 +33,6 @@
 #define CALLMAIN(argc, argv, envp) main(argc, argv, envp)
 #endif
 
-extern "C" void exit (int ret);
-
 GLDEF_C TInt E32Main()
 	{     
 	CTrapCleanup::New();
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cstdlib/UCRT/MCRT0.CPP
--- a/genericopenlibs/cstdlib/UCRT/MCRT0.CPP	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cstdlib/UCRT/MCRT0.CPP	Thu Aug 05 20:12:17 2010 +0530
@@ -33,8 +33,6 @@
 #define CALLMAIN(argc, argv, envp) main(argc, argv, envp)
 #endif
 
-extern "C" void exit (int ret);
-
 GLDEF_C TInt E32Main()
 	{     
 	CTrapCleanup::New();
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cstdlib/UCRT/WCRT0.CPP
--- a/genericopenlibs/cstdlib/UCRT/WCRT0.CPP	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cstdlib/UCRT/WCRT0.CPP	Thu Aug 05 20:12:17 2010 +0530
@@ -25,8 +25,6 @@
 
 extern "C" int main (int argc, char *argv[], char *envp[]);
 
-extern "C" void exit (int ret);
-
 #ifndef EKA2
 IMPORT_C void RegisterWsExe(const TDesC &aName);
 #endif
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cstdlib/UCRT/WECRT0.CPP
--- a/genericopenlibs/cstdlib/UCRT/WECRT0.CPP	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cstdlib/UCRT/WECRT0.CPP	Thu Aug 05 20:12:17 2010 +0530
@@ -22,8 +22,6 @@
 
 extern "C" int wmain (int argc, wchar_t *argv[], wchar_t *envp[]);
 
-extern "C" void exit (int ret);
-
 GLDEF_C TInt E32Main()
 	{     
 	CTrapCleanup::New();
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cstdlib/UCRT/WMCRT0.CPP
--- a/genericopenlibs/cstdlib/UCRT/WMCRT0.CPP	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cstdlib/UCRT/WMCRT0.CPP	Thu Aug 05 20:12:17 2010 +0530
@@ -22,8 +22,6 @@
 
 extern "C" int wmain (int argc, wchar_t *argv[], wchar_t *envp[]);
 
-extern "C" void exit (int ret);
-
 GLDEF_C TInt E32Main()
 	{     
 	CTrapCleanup::New();
diff -r ab61c4cedc64 -r e5d77a29bdca genericopenlibs/cstdlib/UCRT/WWCRT0.CPP
--- a/genericopenlibs/cstdlib/UCRT/WWCRT0.CPP	Thu Aug 05 18:45:56 2010 +0530
+++ b/genericopenlibs/cstdlib/UCRT/WWCRT0.CPP	Thu Aug 05 20:12:17 2010 +0530
@@ -26,8 +26,6 @@
 
 extern "C" int wmain (int argc, wchar_t *argv[], wchar_t *envp[]);
 
-extern "C" void exit (int ret);
-
 #ifndef EKA2
 IMPORT_C void RegisterWsExe(const TDesC &aName);
 #endif
diff -r ab61c4cedc64 -r e5d77a29bdca glib/build/symbian/tests/group/bld.inf
--- a/glib/build/symbian/tests/group/bld.inf	Thu Aug 05 18:45:56 2010 +0530
+++ b/glib/build/symbian/tests/group/bld.inf	Thu Aug 05 20:12:17 2010 +0530
@@ -20,6 +20,7 @@
 PRJ_TESTEXPORTS
 glibtests.iby  									/epoc32/rom/include/glibtests.iby
 locale.iby  									/epoc32/rom/include/locale.iby
+locale_new.iby  								/epoc32/rom/include/locale_new.iby
 ../../../../tests/markups/valid-1.gmarkup 	/epoc32/winscw/c/valid-1.gmarkup
 ../../../../tests/iochannel-test-infile		/epoc32/winscw/c/iochannel-test-infile
 ../../../../tests/casemap.txt			/epoc32/winscw/c/casemap.txt
diff -r ab61c4cedc64 -r e5d77a29bdca glib/build/symbian/tests/group/locale_new.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/glib/build/symbian/tests/group/locale_new.iby	Thu Aug 05 20:12:17 2010 +0530
@@ -0,0 +1,177 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "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:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:   IBY file for new locale model
+*
+*/
+
+
+
+
+
+#ifndef LOCALE_NEW_IBY
+#define LOCALE_NEW_IBY
+
+file=\epoc32\release\armv5\urel\elocl_col.002		SHARED_LIB_DIR\elocl_col.002
+file=\epoc32\release\armv5\urel\elocl_col.003		SHARED_LIB_DIR\elocl_col.003
+file=\epoc32\release\armv5\urel\elocl_col.004		SHARED_LIB_DIR\elocl_col.004
+file=\epoc32\release\armv5\urel\elocl_col.005		SHARED_LIB_DIR\elocl_col.005
+file=\epoc32\release\armv5\urel\elocl_col.006		SHARED_LIB_DIR\elocl_col.006
+file=\epoc32\release\armv5\urel\elocl_col.007		SHARED_LIB_DIR\elocl_col.007
+file=\epoc32\release\armv5\urel\elocl_col.008		SHARED_LIB_DIR\elocl_col.008
+file=\epoc32\release\armv5\urel\elocl_col.009		SHARED_LIB_DIR\elocl_col.009
+file=\epoc32\release\armv5\urel\elocl_col.010		SHARED_LIB_DIR\elocl_col.010
+file=\epoc32\release\armv5\urel\elocl_col.013		SHARED_LIB_DIR\elocl_col.013
+file=\epoc32\release\armv5\urel\elocl_col.014		SHARED_LIB_DIR\elocl_col.014
+file=\epoc32\release\armv5\urel\elocl_col.015		SHARED_LIB_DIR\elocl_col.015
+file=\epoc32\release\armv5\urel\elocl_col.016		SHARED_LIB_DIR\elocl_col.016
+file=\epoc32\release\armv5\urel\elocl_col.017		SHARED_LIB_DIR\elocl_col.017
+file=\epoc32\release\armv5\urel\elocl_col.018		SHARED_LIB_DIR\elocl_col.018
+file=\epoc32\release\armv5\urel\elocl_col.019		SHARED_LIB_DIR\elocl_col.019
+file=\epoc32\release\armv5\urel\elocl_col.025		SHARED_LIB_DIR\elocl_col.025
+file=\epoc32\release\armv5\urel\elocl_col.026		SHARED_LIB_DIR\elocl_col.026
+file=\epoc32\release\armv5\urel\elocl_col.027		SHARED_LIB_DIR\elocl_col.027
+file=\epoc32\release\armv5\urel\elocl_col.028		SHARED_LIB_DIR\elocl_col.028
+file=\epoc32\release\armv5\urel\elocl_col.029		SHARED_LIB_DIR\elocl_col.029
+file=\epoc32\release\armv5\urel\elocl_col.030		SHARED_LIB_DIR\elocl_col.030
+file=\epoc32\release\armv5\urel\elocl_col.031		SHARED_LIB_DIR\elocl_col.031
+file=\epoc32\release\armv5\urel\elocl_col.032		SHARED_LIB_DIR\elocl_col.032
+file=\epoc32\release\armv5\urel\elocl_col.033		SHARED_LIB_DIR\elocl_col.033
+file=\epoc32\release\armv5\urel\elocl_col.037		SHARED_LIB_DIR\elocl_col.037
+file=\epoc32\release\armv5\urel\elocl_col.039		SHARED_LIB_DIR\elocl_col.039
+file=\epoc32\release\armv5\urel\elocl_col.042		SHARED_LIB_DIR\elocl_col.042
+file=\epoc32\release\armv5\urel\elocl_col.044		SHARED_LIB_DIR\elocl_col.044
+file=\epoc32\release\armv5\urel\elocl_col.045		SHARED_LIB_DIR\elocl_col.045
+file=\epoc32\release\armv5\urel\elocl_col.049		SHARED_LIB_DIR\elocl_col.049
+file=\epoc32\release\armv5\urel\elocl_col.050		SHARED_LIB_DIR\elocl_col.050
+file=\epoc32\release\armv5\urel\elocl_col.051		SHARED_LIB_DIR\elocl_col.051
+file=\epoc32\release\armv5\urel\elocl_col.054		SHARED_LIB_DIR\elocl_col.054
+file=\epoc32\release\armv5\urel\elocl_col.057		SHARED_LIB_DIR\elocl_col.057
+file=\epoc32\release\armv5\urel\elocl_col.058		SHARED_LIB_DIR\elocl_col.058
+file=\epoc32\release\armv5\urel\elocl_col.059		SHARED_LIB_DIR\elocl_col.059
+file=\epoc32\release\armv5\urel\elocl_col.065		SHARED_LIB_DIR\elocl_col.065
+file=\epoc32\release\armv5\urel\elocl_col.067		SHARED_LIB_DIR\elocl_col.067
+file=\epoc32\release\armv5\urel\elocl_col.068		SHARED_LIB_DIR\elocl_col.068
+file=\epoc32\release\armv5\urel\elocl_col.070		SHARED_LIB_DIR\elocl_col.070
+file=\epoc32\release\armv5\urel\elocl_col.076		SHARED_LIB_DIR\elocl_col.076
+file=\epoc32\release\armv5\urel\elocl_col.078		SHARED_LIB_DIR\elocl_col.078
+file=\epoc32\release\armv5\urel\elocl_col.079		SHARED_LIB_DIR\elocl_col.079
+file=\epoc32\release\armv5\urel\elocl_col.083		SHARED_LIB_DIR\elocl_col.083
+file=\epoc32\release\armv5\urel\elocl_col.093		SHARED_LIB_DIR\elocl_col.093
+file=\epoc32\release\armv5\urel\elocl_col.094		SHARED_LIB_DIR\elocl_col.094
+file=\epoc32\release\armv5\urel\elocl_col.096		SHARED_LIB_DIR\elocl_col.096
+file=\epoc32\release\armv5\urel\elocl_col.102		SHARED_LIB_DIR\elocl_col.102
+file=\epoc32\release\armv5\urel\elocl_col.103		SHARED_LIB_DIR\elocl_col.103
+file=\epoc32\release\armv5\urel\elocl_col.1034		SHARED_LIB_DIR\elocl_col.1034
+file=\epoc32\release\armv5\urel\elocl_lan.002		SHARED_LIB_DIR\elocl_lan.002
+file=\epoc32\release\armv5\urel\elocl_lan.003		SHARED_LIB_DIR\elocl_lan.003
+file=\epoc32\release\armv5\urel\elocl_lan.004		SHARED_LIB_DIR\elocl_lan.004
+file=\epoc32\release\armv5\urel\elocl_lan.005		SHARED_LIB_DIR\elocl_lan.005
+file=\epoc32\release\armv5\urel\elocl_lan.006		SHARED_LIB_DIR\elocl_lan.006
+file=\epoc32\release\armv5\urel\elocl_lan.007		SHARED_LIB_DIR\elocl_lan.007
+file=\epoc32\release\armv5\urel\elocl_lan.008		SHARED_LIB_DIR\elocl_lan.008
+file=\epoc32\release\armv5\urel\elocl_lan.009		SHARED_LIB_DIR\elocl_lan.009
+file=\epoc32\release\armv5\urel\elocl_lan.010		SHARED_LIB_DIR\elocl_lan.010
+file=\epoc32\release\armv5\urel\elocl_lan.013		SHARED_LIB_DIR\elocl_lan.013
+file=\epoc32\release\armv5\urel\elocl_lan.014		SHARED_LIB_DIR\elocl_lan.014
+file=\epoc32\release\armv5\urel\elocl_lan.015		SHARED_LIB_DIR\elocl_lan.015
+file=\epoc32\release\armv5\urel\elocl_lan.016		SHARED_LIB_DIR\elocl_lan.016
+file=\epoc32\release\armv5\urel\elocl_lan.017		SHARED_LIB_DIR\elocl_lan.017
+file=\epoc32\release\armv5\urel\elocl_lan.018		SHARED_LIB_DIR\elocl_lan.018
+file=\epoc32\release\armv5\urel\elocl_lan.019		SHARED_LIB_DIR\elocl_lan.019
+file=\epoc32\release\armv5\urel\elocl_lan.025		SHARED_LIB_DIR\elocl_lan.025
+file=\epoc32\release\armv5\urel\elocl_lan.026		SHARED_LIB_DIR\elocl_lan.026
+file=\epoc32\release\armv5\urel\elocl_lan.027		SHARED_LIB_DIR\elocl_lan.027
+file=\epoc32\release\armv5\urel\elocl_lan.028		SHARED_LIB_DIR\elocl_lan.028
+file=\epoc32\release\armv5\urel\elocl_lan.029		SHARED_LIB_DIR\elocl_lan.029
+file=\epoc32\release\armv5\urel\elocl_lan.030		SHARED_LIB_DIR\elocl_lan.030
+file=\epoc32\release\armv5\urel\elocl_lan.031		SHARED_LIB_DIR\elocl_lan.031
+file=\epoc32\release\armv5\urel\elocl_lan.032		SHARED_LIB_DIR\elocl_lan.032
+file=\epoc32\release\armv5\urel\elocl_lan.033		SHARED_LIB_DIR\elocl_lan.033
+file=\epoc32\release\armv5\urel\elocl_lan.037		SHARED_LIB_DIR\elocl_lan.037
+file=\epoc32\release\armv5\urel\elocl_lan.039		SHARED_LIB_DIR\elocl_lan.039
+file=\epoc32\release\armv5\urel\elocl_lan.042		SHARED_LIB_DIR\elocl_lan.042
+file=\epoc32\release\armv5\urel\elocl_lan.044		SHARED_LIB_DIR\elocl_lan.044
+file=\epoc32\release\armv5\urel\elocl_lan.045		SHARED_LIB_DIR\elocl_lan.045
+file=\epoc32\release\armv5\urel\elocl_lan.049		SHARED_LIB_DIR\elocl_lan.049
+file=\epoc32\release\armv5\urel\elocl_lan.050		SHARED_LIB_DIR\elocl_lan.050
+file=\epoc32\release\armv5\urel\elocl_lan.051		SHARED_LIB_DIR\elocl_lan.051
+file=\epoc32\release\armv5\urel\elocl_lan.054		SHARED_LIB_DIR\elocl_lan.054
+file=\epoc32\release\armv5\urel\elocl_lan.057		SHARED_LIB_DIR\elocl_lan.057
+file=\epoc32\release\armv5\urel\elocl_lan.058		SHARED_LIB_DIR\elocl_lan.058
+file=\epoc32\release\armv5\urel\elocl_lan.059		SHARED_LIB_DIR\elocl_lan.059
+file=\epoc32\release\armv5\urel\elocl_lan.065		SHARED_LIB_DIR\elocl_lan.065
+file=\epoc32\release\armv5\urel\elocl_lan.067		SHARED_LIB_DIR\elocl_lan.067
+file=\epoc32\release\armv5\urel\elocl_lan.068		SHARED_LIB_DIR\elocl_lan.068
+file=\epoc32\release\armv5\urel\elocl_lan.070		SHARED_LIB_DIR\elocl_lan.070
+file=\epoc32\release\armv5\urel\elocl_lan.076		SHARED_LIB_DIR\elocl_lan.076
+file=\epoc32\release\armv5\urel\elocl_lan.078		SHARED_LIB_DIR\elocl_lan.078
+file=\epoc32\release\armv5\urel\elocl_lan.079		SHARED_LIB_DIR\elocl_lan.079
+file=\epoc32\release\armv5\urel\elocl_lan.083		SHARED_LIB_DIR\elocl_lan.083
+file=\epoc32\release\armv5\urel\elocl_lan.093		SHARED_LIB_DIR\elocl_lan.093
+file=\epoc32\release\armv5\urel\elocl_lan.094		SHARED_LIB_DIR\elocl_lan.094
+file=\epoc32\release\armv5\urel\elocl_lan.095		SHARED_LIB_DIR\elocl_lan.095
+file=\epoc32\release\armv5\urel\elocl_lan.096		SHARED_LIB_DIR\elocl_lan.096
+file=\epoc32\release\armv5\urel\elocl_lan.103		SHARED_LIB_DIR\elocl_lan.103
+file=\epoc32\release\armv5\urel\elocl_lan.1034		SHARED_LIB_DIR\elocl_lan.1034
+file=\epoc32\release\armv5\urel\elocl_lan.401		SHARED_LIB_DIR\elocl_lan.401
+file=\epoc32\release\armv5\urel\elocl_reg.056		SHARED_LIB_DIR\elocl_reg.056
+file=\epoc32\release\armv5\urel\elocl_reg.076		SHARED_LIB_DIR\elocl_reg.076
+file=\epoc32\release\armv5\urel\elocl_reg.100		SHARED_LIB_DIR\elocl_reg.100
+file=\epoc32\release\armv5\urel\elocl_reg.124		SHARED_LIB_DIR\elocl_reg.124
+file=\epoc32\release\armv5\urel\elocl_reg.156		SHARED_LIB_DIR\elocl_reg.156
+file=\epoc32\release\armv5\urel\elocl_reg.158		SHARED_LIB_DIR\elocl_reg.158
+file=\epoc32\release\armv5\urel\elocl_reg.191		SHARED_LIB_DIR\elocl_reg.191
+file=\epoc32\release\armv5\urel\elocl_reg.203		SHARED_LIB_DIR\elocl_reg.203
+file=\epoc32\release\armv5\urel\elocl_reg.208		SHARED_LIB_DIR\elocl_reg.208
+file=\epoc32\release\armv5\urel\elocl_reg.233		SHARED_LIB_DIR\elocl_reg.233
+file=\epoc32\release\armv5\urel\elocl_reg.246		SHARED_LIB_DIR\elocl_reg.246
+file=\epoc32\release\armv5\urel\elocl_reg.250		SHARED_LIB_DIR\elocl_reg.250
+file=\epoc32\release\armv5\urel\elocl_reg.276		SHARED_LIB_DIR\elocl_reg.276
+file=\epoc32\release\armv5\urel\elocl_reg.300		SHARED_LIB_DIR\elocl_reg.300
+file=\epoc32\release\armv5\urel\elocl_reg.344		SHARED_LIB_DIR\elocl_reg.344
+file=\epoc32\release\armv5\urel\elocl_reg.348		SHARED_LIB_DIR\elocl_reg.348
+file=\epoc32\release\armv5\urel\elocl_reg.352		SHARED_LIB_DIR\elocl_reg.352
+file=\epoc32\release\armv5\urel\elocl_reg.356		SHARED_LIB_DIR\elocl_reg.356
+file=\epoc32\release\armv5\urel\elocl_reg.360		SHARED_LIB_DIR\elocl_reg.360
+file=\epoc32\release\armv5\urel\elocl_reg.364		SHARED_LIB_DIR\elocl_reg.364
+file=\epoc32\release\armv5\urel\elocl_reg.376		SHARED_LIB_DIR\elocl_reg.376
+file=\epoc32\release\armv5\urel\elocl_reg.380		SHARED_LIB_DIR\elocl_reg.380
+file=\epoc32\release\armv5\urel\elocl_reg.392		SHARED_LIB_DIR\elocl_reg.392
+file=\epoc32\release\armv5\urel\elocl_reg.410		SHARED_LIB_DIR\elocl_reg.410
+file=\epoc32\release\armv5\urel\elocl_reg.428		SHARED_LIB_DIR\elocl_reg.428
+file=\epoc32\release\armv5\urel\elocl_reg.440		SHARED_LIB_DIR\elocl_reg.440
+file=\epoc32\release\armv5\urel\elocl_reg.458		SHARED_LIB_DIR\elocl_reg.458
+file=\epoc32\release\armv5\urel\elocl_reg.484		SHARED_LIB_DIR\elocl_reg.484
+file=\epoc32\release\armv5\urel\elocl_reg.528		SHARED_LIB_DIR\elocl_reg.528
+file=\epoc32\release\armv5\urel\elocl_reg.578		SHARED_LIB_DIR\elocl_reg.578
+file=\epoc32\release\armv5\urel\elocl_reg.586		SHARED_LIB_DIR\elocl_reg.586
+file=\epoc32\release\armv5\urel\elocl_reg.608		SHARED_LIB_DIR\elocl_reg.608
+file=\epoc32\release\armv5\urel\elocl_reg.616		SHARED_LIB_DIR\elocl_reg.616
+file=\epoc32\release\armv5\urel\elocl_reg.620		SHARED_LIB_DIR\elocl_reg.620
+file=\epoc32\release\armv5\urel\elocl_reg.642		SHARED_LIB_DIR\elocl_reg.642
+file=\epoc32\release\armv5\urel\elocl_reg.643		SHARED_LIB_DIR\elocl_reg.643
+file=\epoc32\release\armv5\urel\elocl_reg.682		SHARED_LIB_DIR\elocl_reg.682
+file=\epoc32\release\armv5\urel\elocl_reg.703		SHARED_LIB_DIR\elocl_reg.703
+file=\epoc32\release\armv5\urel\elocl_reg.704		SHARED_LIB_DIR\elocl_reg.704
+file=\epoc32\release\armv5\urel\elocl_reg.705		SHARED_LIB_DIR\elocl_reg.705
+file=\epoc32\release\armv5\urel\elocl_reg.724		SHARED_LIB_DIR\elocl_reg.724
+file=\epoc32\release\armv5\urel\elocl_reg.752		SHARED_LIB_DIR\elocl_reg.752
+file=\epoc32\release\armv5\urel\elocl_reg.764		SHARED_LIB_DIR\elocl_reg.764
+file=\epoc32\release\armv5\urel\elocl_reg.792		SHARED_LIB_DIR\elocl_reg.792
+file=\epoc32\release\armv5\urel\elocl_reg.804		SHARED_LIB_DIR\elocl_reg.804
+file=\epoc32\release\armv5\urel\elocl_reg.840		SHARED_LIB_DIR\elocl_reg.840
+file=\epoc32\release\armv5\urel\elocl_reg.891		SHARED_LIB_DIR\elocl_reg.891
+
+
+#endif
\ No newline at end of file
diff -r ab61c4cedc64 -r e5d77a29bdca glib/tests/child-test.c
--- a/glib/tests/child-test.c	Thu Aug 05 18:45:56 2010 +0530
+++ b/glib/tests/child-test.c	Thu Aug 05 20:12:17 2010 +0530
@@ -62,12 +62,9 @@
 {
   GPid pid;
 #ifdef __SYMBIAN32__  
-  gint retval;
-#if 0  //for using g_spawn_async
   gboolean retval;
   char **argv = NULL;
   GError *error = NULL;
-#endif//if 0  
 #endif//__SYMBIAN32__  
 #ifdef G_OS_WIN32
   STARTUPINFO si;
@@ -89,18 +86,14 @@
   pid = pi.hProcess;
 
   return pid;
-#endif
+#endif //G_OS_WIN32
 #ifndef __SYMBIAN32__
   pid = fork ();
 #else  
-  retval = posix_spawn(&pid, "helloworld.exe", NULL,NULL,NULL,NULL);
-  (void)waitpid(pid,NULL,0);
-#if 0  
   argv = (char **)malloc(3*sizeof(char *));    
   argv[0] = "Helloworld.exe"; // wrong exe name. Should cause g_spawn_async to fail
   argv[1] = NULL;
   retval = g_spawn_async(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, "1234", &pid, &error);
-#endif//if 0
   if (pid < 0)
     exit (1);
 
@@ -109,7 +102,7 @@
 
   sleep (ttl);
   _exit (0);
-#endif /* G_OS_WIN32 */
+#endif /*__SYMBIAN32__*/
 }
 
 gboolean
diff -r ab61c4cedc64 -r e5d77a29bdca glib/tests/module-test.c
--- a/glib/tests/module-test.c	Thu Aug 05 18:45:56 2010 +0530
+++ b/glib/tests/module-test.c	Thu Aug 05 20:12:17 2010 +0530
@@ -94,14 +94,10 @@
 
 #ifndef __SYMBIAN32__
   dir = g_get_current_dir ()
-#else  
-  dir = "z:\\sys\\bin";
 #endif  
 
-  plugin_a = g_strconcat (dir, G_DIR_SEPARATOR_S, "libmoduletestplugin_a.dll", 
-			  NULL);
-  plugin_b = g_strconcat (dir, G_DIR_SEPARATOR_S, "libmoduletestplugin_b.dll", 
-			  NULL);
+  plugin_a = "libmoduletestplugin_a.dll";
+  plugin_b = "libmoduletestplugin_b.dll";
 
 #ifndef __SYMBIAN32__
   g_free (dir);