summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2005-04-12 23:52:29 +0000
committerEric Andersen <andersen@codepoet.org>2005-04-12 23:52:29 +0000
commit44c04f38df55ac9814c7d0eb5c62a26a25105116 (patch)
treeb1b642294ec48ef8d119701085e636a23dcc2085
parenta33e642102ded1ff1491d84a823f1d35c8e9a979 (diff)
fix a thinko -- we cant use
-rw-r--r--ldso/ldso/ldso.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c
index b6174c09e..6c91b86e0 100644
--- a/ldso/ldso/ldso.c
+++ b/ldso/ldso/ldso.c
@@ -127,10 +127,11 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr,
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;
@@ -141,6 +142,11 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr,
_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