svn commit: trunk/uClibc/libc/misc/internals

[vapier at uclibc.org]

Author: vapier
Date: 2007-06-01 12:17:36 -0700 (Fri, 01 Jun 2007)
New Revision: 18722

Log:
change the auxvt code from being dependent on MMU to !LDSO as auxvt things are ELF-specific, not MMU-specific

Modified:
   trunk/uClibc/libc/misc/internals/__uClibc_main.c


Changeset:
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c	2007-06-01 14:40:03 UTC (rev 18721)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c	2007-06-01 19:17:36 UTC (rev 18722)
@@ -33,7 +33,7 @@
 #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 @@
 # 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 @@
 		    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 @@
 	__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 @@
      * __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;