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

[andersen at uclibc.org]

Author: andersen
Date: 2005-04-12 17:52:29 -0600 (Tue, 12 Apr 2005)
New Revision: 10086

Log:
fix a thinko -- we cant use 


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


Changeset:
Modified: trunk/uClibc/ldso/ldso/ldso.c
===================================================================
--- trunk/uClibc/ldso/ldso/ldso.c	2005-04-12 23:14:17 UTC (rev 10085)
+++ trunk/uClibc/ldso/ldso/ldso.c	2005-04-12 23:52:29 UTC (rev 10086)
@@ -127,11 +127,12 @@
 	ElfW(Addr) relro_addr = 0;
 	size_t relro_size = 0;
 
-#ifdef __SUPPORT_LD_DEBUG_EARLY__
-	/* Wahoo!!! */
-	_dl_dprintf(_dl_debug_file, "Cool, we managed to make a function call.\n");
-#endif
 
+	/* Wahoo!!! We managed to make a function call!  Get malloc
+	 * setup so we can use _dl_dprintf() to print debug noise
+	 * instead of the SEND_STDERR macros used in dl-startup.c */
+
+
 	/* Store the page size for later use */
 	_dl_pagesize = (auxvt[AT_PAGESZ].a_un.a_val) ? (size_t) auxvt[AT_PAGESZ].a_un.a_val : PAGE_SIZE;
 	/* Make it so _dl_malloc can use the page of memory we have already
@@ -141,6 +142,11 @@
 	_dl_malloc_addr = (unsigned char *)_dl_pagesize;
 	_dl_mmap_zero = 0;
 
+#ifdef __SUPPORT_LD_DEBUG_EARLY__
+	/* Wahoo!!! */
+	_dl_dprintf(_dl_debug_file, "\nCool, ldso survived making function calls.\n");
+#endif
+
 	/* Now we have done the mandatory linking of some things.  We are now
 	 * free to start using global variables, since these things have all
 	 * been fixed up by now.  Still no function calls outside of this