svn commit: branches/uClibc_0_9_29/libc/misc/internals

vapier at uclibc.org vapier at uclibc.org
Sat Jan 5 17:23:53 UTC 2008


Author: vapier
Date: 2008-01-05 09:23:53 -0800 (Sat, 05 Jan 2008)
New Revision: 20743

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


Modified:
   branches/uClibc_0_9_29/libc/misc/internals/__uClibc_main.c


Changeset:
Modified: branches/uClibc_0_9_29/libc/misc/internals/__uClibc_main.c
===================================================================
--- branches/uClibc_0_9_29/libc/misc/internals/__uClibc_main.c	2008-01-05 17:21:42 UTC (rev 20742)
+++ branches/uClibc_0_9_29/libc/misc/internals/__uClibc_main.c	2008-01-05 17:23:53 UTC (rev 20743)
@@ -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;
 




More information about the uClibc-cvs mailing list