[uClibc-cvs] svn commit: trunk/uClibc/libc/sysdeps/linux/powerpc

[jocke at uclibc.org]

Author: jocke
Date: 2005-05-26 16:27:40 -0600 (Thu, 26 May 2005)
New Revision: 10414

Log:
Fix PPC wrt new __uClibc_start_main.


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


Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/powerpc/crt1.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/powerpc/crt1.S	2005-05-26 22:19:19 UTC (rev 10413)
+++ trunk/uClibc/libc/sysdeps/linux/powerpc/crt1.S	2005-05-26 22:27:40 UTC (rev 10414)
@@ -58,23 +58,18 @@
 	lwz	r4,0(r9)
 	/* find argv one word offset from the stack pointer */
 	addi	r5,r9,4
-	/* find environment pointer (argv+argc+1) */
-	lwz	r6,0(r9)
-	addi	r6,r6,1
-	rlwinm	r6,r6,2,0,29
-	add	r6,r6,r5
-	mr	r9,r7 /* Pass _dl_fini from ldso or NULL if statically linked */
+	mr	r8,r7 /* Pass _dl_fini from ldso or NULL if statically linked */
 	/* Ok, now run uClibc's main() -- shouldn't return */
 # ifdef L_Scrt1
-	lwz	r7,_init at got(r31)
-	lwz	r8,_fini at got(r31)
+	lwz	r6,_init at got(r31)
+	lwz	r7,_fini at got(r31)
 	lwz	r3,main at got(r31)
 	b	__uClibc_start_main at plt
 # else
-	lis     r7,_init at ha	# load top 16 bits
-	addi    r7,r7,_init at l	# load bottom 16 bits
-	lis     r8,_fini at ha	# load top 16 bits
-	addi    r8,r8,_fini at l	# load bottom 16 bits
+	lis     r6,_init at ha	# load top 16 bits
+	addi    r6,r6,_init at l	# load bottom 16 bits
+	lis     r7,_fini at ha	# load top 16 bits
+	addi    r7,r7,_fini at l	# load bottom 16 bits
 	lis     r3,main at ha	# load top 16 bits
 	addi    r3,r3,main at l	# load bottom 16 bits
 	b	__uClibc_start_main