svn commit: trunk/uClibc/libc/sysdeps/linux/arm

[vapier at uclibc.org]

Author: vapier
Date: 2006-01-14 02:18:12 -0800 (Sat, 14 Jan 2006)
New Revision: 13315

Log:
fix loading of argc/argv for arm/nommu

Modified:
   trunk/uClibc/libc/sysdeps/linux/arm/crt1.S


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/arm/crt1.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/arm/crt1.S	2006-01-14 07:58:04 UTC (rev 13314)
+++ trunk/uClibc/libc/sysdeps/linux/arm/crt1.S	2006-01-14 10:18:12 UTC (rev 13315)
@@ -110,9 +110,19 @@
 	mov fp, #0
 	mov lr, #0
 
+#ifdef __ARCH_HAS_MMU__
 	/* Pop argc off the stack and save a pointer to argv */
 	ldr a2, [sp], #4
 	mov a3, sp
+#else
+	/*
+	 * uClinux/arm stacks look a little different from normal
+	 * MMU-full Linux/arm stacks (for no good reason)
+	 */
+	/* pull argc and argv off the stack */
+	ldr a2, [sp, #0]
+	ldr a3, [sp, #4]
+#endif
 
 	/* Push stack limit */
 	str a3, [sp, #-4]!