summaryrefslogtreecommitdiff
path: root/libc/misc
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2004-05-11 11:14:58 +0000
committerEric Andersen <andersen@codepoet.org>2004-05-11 11:14:58 +0000
commit68c4b497dd7306e0146ebd8b3bbc8289ed4c6e33 (patch)
treeb76126f13f820979dac7a8084bd5a82f39c82995 /libc/misc
parentfd4f96fda50d2462621de89762659e7cc7d648a9 (diff)
make certain that getpagesize() returns correct the value for mips
by extracting the value from the ELF header.
Diffstat (limited to 'libc/misc')
-rw-r--r--libc/misc/internals/__uClibc_main.c28
1 files changed, 25 insertions, 3 deletions
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 73abcfa77..79b71cb3c 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -1,6 +1,6 @@
/*
* Manuel Novoa III Feb 2001
- * Erik Andersen Mar 2002
+ * Erik Andersen 2002-2004
*
* __uClibc_main is the routine to be called by all the arch-specific
* versions of crt0.S in uClibc.
@@ -15,6 +15,8 @@
#include <features.h>
#include <unistd.h>
#include <stdlib.h>
+#include <string.h>
+#include <elf.h>
#ifdef __UCLIBC_PROPOLICE__
extern void __guard_setup(void);
#endif
@@ -44,6 +46,9 @@ extern void weak_function __pthread_initialize_minimal(void);
* environ symbol is also included.
*/
+extern int _dl_secure;
+extern size_t _dl_pagesize;
+
char **__environ = 0;
const char *__progname = 0;
weak_alias(__environ, environ);
@@ -116,6 +121,23 @@ void __attribute__ ((__noreturn__))
__uClibc_start_main(int argc, char **argv, char **envp,
void (*app_init)(void), void (*app_fini)(void))
{
+ unsigned long *aux_dat;
+ Elf32_auxv_t auxvt[AT_EGID + 1];
+
+ /* Pull stuff from the ELF header when possible */
+ aux_dat = (unsigned long*)envp;
+ while (*aux_dat) {
+ aux_dat++;
+ }
+ aux_dat++;
+ while (*aux_dat) {
+ Elf32_auxv_t *auxv_entry = (Elf32_auxv_t *) aux_dat;
+ if (auxv_entry->a_type <= AT_EGID) {
+ memcpy(&(auxvt[auxv_entry->a_type]), auxv_entry, sizeof(Elf32_auxv_t));
+ }
+ aux_dat += 2;
+ }
+ _dl_pagesize = (auxvt[AT_PAGESZ].a_un.a_val)? auxvt[AT_PAGESZ].a_un.a_val : 4096;
/* If we are dynamically linked the shared lib loader already
* did this for us. But if we are statically linked, we need
@@ -134,7 +156,7 @@ __uClibc_start_main(int argc, char **argv, char **envp,
#ifdef __UCLIBC_CTOR_DTOR__
/* Arrange for the application's dtors to run before we exit. */
- __app_fini = app_fini;
+ __app_fini = app_fini;
/* Run all the application's ctors now. */
if (app_init!=NULL) {
@@ -143,7 +165,7 @@ __uClibc_start_main(int argc, char **argv, char **envp,
#endif
#ifdef __UCLIBC_PROPOLICE__
- __guard_setup ();
+ __guard_setup ();
#endif
/* Note: It is possible that any initialization done above could