[uClibc-cvs] svn commit: trunk/uClibc/ldso/ldso

andersen at uclibc.org andersen at uclibc.org
Fri Apr 1 20:17:13 UTC 2005


Author: andersen
Date: 2005-04-01 13:17:12 -0700 (Fri, 01 Apr 2005)
New Revision: 10070

Log:
minor cosmetic cleanup


Modified:
   trunk/uClibc/ldso/ldso/ldso.c


Changeset:
Modified: trunk/uClibc/ldso/ldso/ldso.c
===================================================================
--- trunk/uClibc/ldso/ldso/ldso.c	2005-04-01 19:47:07 UTC (rev 10069)
+++ trunk/uClibc/ldso/ldso/ldso.c	2005-04-01 20:17:12 UTC (rev 10070)
@@ -823,20 +823,23 @@
 		}
 	}
 #ifndef _DL_DO_FINI_IN_LIBC
-/* arches that has moved their ldso FINI handling should ship this part */
+	/* arches that have moved their ldso FINI handling should skip this part */
 	{
-		int (*_dl_atexit) (void *) = (int (*)(void *)) (intptr_t) _dl_find_hash("atexit", _dl_symbol_tables, NULL, ELF_RTYPE_CLASS_PLT);
+		int (*_dl_atexit) (void *) = (int (*)(void *)) (intptr_t) _dl_find_hash("atexit",
+				_dl_symbol_tables, NULL, ELF_RTYPE_CLASS_PLT);
 
 		if (_dl_atexit)
 			(*_dl_atexit) (_dl_fini);
-		/* Notify the debugger that all objects are now mapped in.  */
 	}
 #endif
+
+	/* Find the real malloc function and make ldso functions use that from now on */
+	 _dl_malloc_function = (void* (*)(size_t)) (intptr_t) _dl_find_hash("malloc",
+			 _dl_symbol_tables, NULL, ELF_RTYPE_CLASS_PLT);
+
+	/* Notify the debugger that all objects are now mapped in.  */
 	_dl_debug_addr->r_state = RT_CONSISTENT;
 	_dl_debug_state();
-
-	/* Find the real malloc function and make ldso functions use that from now on */
-	 _dl_malloc_function = (void* (*)(size_t)) (intptr_t) _dl_find_hash("malloc", _dl_symbol_tables, NULL, ELF_RTYPE_CLASS_PLT);
 }
 
 char *_dl_getenv(const char *symbol, char **envp)




More information about the uClibc-cvs mailing list