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

vapier at uclibc.org vapier at uclibc.org
Tue Jan 3 01:00:02 UTC 2006


Author: vapier
Date: 2006-01-02 17:00:00 -0800 (Mon, 02 Jan 2006)
New Revision: 13035

Log:
fix previous commit so that __uClibc_init() is run for non-mmu cases again as report by Thomas in Bug 618

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	2006-01-02 21:27:33 UTC (rev 13034)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c	2006-01-03 01:00:00 UTC (rev 13035)
@@ -217,8 +217,8 @@
 	__environ = &argv[argc];
     }
 
+#ifdef __ARCH_HAS_MMU__
     /* Pull stuff from the ELF header when possible */
-#ifdef __ARCH_HAS_MMU__
     aux_dat = (unsigned long*)__environ;
     while (*aux_dat) {
 	aux_dat++;
@@ -231,12 +231,14 @@
 	}
 	aux_dat += 2;
     }
+#endif
 
     /* We need to initialize uClibc.  If we are dynamically linked this
      * may have already been completed by the shared lib loader.  We call
      * __uClibc_init() regardless, to be sure the right thing happens. */
     __uClibc_init();
 
+#ifdef __ARCH_HAS_MMU__
     /* 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