diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2007-06-01 19:17:36 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-06-01 19:17:36 +0000 |
| commit | 7bb0258ff93df6193986a536c3c0caca262a13bd (patch) | |
| tree | 5a410121113c11a7adc6d66590d6bb3317fa4cc3 /libc/misc/internals/__uClibc_main.c | |
| parent | d662b0123152d4d7e1663f49cd8a01ed302cc2e1 (diff) | |
change the auxvt code from being dependent on MMU to !LDSO as auxvt things are ELF-specific, not MMU-specific
Diffstat (limited to 'libc/misc/internals/__uClibc_main.c')
| -rw-r--r-- | libc/misc/internals/__uClibc_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index 1a9bc2a50..91c8a3984 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -33,7 +33,7 @@ libc_hidden_proto(exit) #ifdef __UCLIBC_HAS_PROGRAM_INVOCATION_NAME__ libc_hidden_proto(strrchr) #endif -#ifdef __ARCH_USE_MMU__ +#ifndef __ARCH_HAS_NO_LDSO__ libc_hidden_proto(memcpy) libc_hidden_proto(getgid) libc_hidden_proto(getuid) @@ -129,7 +129,7 @@ size_t __pagesize = 0; # define O_NOFOLLOW 0 #endif -#ifdef __ARCH_USE_MMU__ +#ifndef __ARCH_HAS_NO_LDSO__ static void __check_one_fd(int fd, int mode) { /* Check if the specified fd is already open */ @@ -277,7 +277,7 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc, char **argv, void (*app_init)(void), void (*app_fini)(void), void (*rtld_fini)(void), void *stack_end) { -#ifdef __ARCH_USE_MMU__ +#ifndef __ARCH_HAS_NO_LDSO__ unsigned long *aux_dat; ElfW(auxv_t) auxvt[AT_EGID + 1]; #endif @@ -298,7 +298,7 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc, __environ = &argv[argc]; } -#ifdef __ARCH_USE_MMU__ +#ifndef __ARCH_HAS_NO_LDSO__ /* Pull stuff from the ELF header when possible */ memset(auxvt, 0x00, sizeof(auxvt)); aux_dat = (unsigned long*)__environ; @@ -320,7 +320,7 @@ void __uClibc_main(int (*main)(int, char **, char **), int argc, * __uClibc_init() regardless, to be sure the right thing happens. */ __uClibc_init(); -#ifdef __ARCH_USE_MMU__ +#ifndef __ARCH_HAS_NO_LDSO__ /* Make certain getpagesize() gives the correct answer */ __pagesize = (auxvt[AT_PAGESZ].a_un.a_val)? auxvt[AT_PAGESZ].a_un.a_val : PAGE_SIZE; |