svn commit: trunk/uClibc/libc/sysdeps/linux/hppa
vapier at uclibc.org
vapier at uclibc.org
Sun Jan 8 06:47:06 UTC 2006
Author: vapier
Date: 2006-01-07 22:47:05 -0800 (Sat, 07 Jan 2006)
New Revision: 13146
Log:
update to parisc cvs
Modified:
trunk/uClibc/libc/sysdeps/linux/hppa/crt1.S
Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/hppa/crt1.S
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/hppa/crt1.S 2006-01-08 06:46:59 UTC (rev 13145)
+++ trunk/uClibc/libc/sysdeps/linux/hppa/crt1.S 2006-01-08 06:47:05 UTC (rev 13146)
@@ -34,16 +34,27 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
- .text
-
- .align 4
-
.import main, code
.import $global$, data
.import __uClibc_main, code
.import _fini, code
.import _init, code
+ /* Have the linker create plabel words
+ so we get PLABEL32 relocs and not 21/14 */
+ .section .rodata
+ .align 4
+.Lpmain:
+ .word P%main
+.Lp__uClibc_main:
+ .word P%__uClibc_main
+.Lp_fini:
+ .word P%_fini
+.Lp_init:
+ .word P%_init
+
+ .text
+ .align 4
.globl _start
.export _start, ENTRY
.type _start, at function
@@ -52,28 +63,41 @@
.proc
.callinfo
- /* load main */
- ldil LP%main, %r26
- ldo RP%main(%r26), %r26
-
- /* argc and argv should be in 25 and 24 */
-
/* Expand the stack to store the 5th through 7th args */
ldo 64(%sp), %sp
+ /* TODO: Follow ABI? Place more things on the stack here... */
- /* void (*rtld_fini) (void) (actually the 6th arg) */
+#ifdef __PIC__
+ /* load main (1st argument) */
+ addil LR'.Lpmain, %r19
+ ldw RR'.Lpmain(%r1), %r26
+ ldw 0(%r26),%r26
+ /* argc and argv should be in 25 and 24 (2nd and 3rd argument) */
+ /* void (*init) (void) (4th argument) */
+ addil LR'.Lp_init, %r19
+ ldw RR'.Lp_init(%r1), %r23
+ ldw 0(%r23), %r23
+ /* void (*fini) (void) (5th argument) */
+ addil LR'.Lp_fini, %r19
+ ldw RR'.Lp_fini(%r1), %r22
+ ldw 0(%r22), %r22
+#else
+ /* load main (1st argument) */
+ ldil LR'.Lpmain, %r26
+ ldw RR'.Lpmain(%r26), %r26
+ /* argc and argv should be in 25 and 24 (2nd and 3rd argument) */
+ /* void (*init) (void) (4th argument) */
+ ldil LR'.Lp_init, %r23
+ ldw RR'.Lp_init(%r23), %r23
+ /* void (*fini) (void) (5th argument) */
+ ldil LR'.Lp_fini, %r22
+ ldw RR'.Lp_fini(%r22), %r22
+#endif
+ /* Store 5th argument */
+ stw %r22, -52(%sp)
+ /* void (*rtld_fini) (void) (6th argument) */
stw %r23, -56(%sp)
-
- /* void (*init) (void) */
- ldil LP%_init, %r23
- ldo RP%_init(%r23), %r23
-
- /* void (*fini) (void) */
- ldil LP%_fini, %r22
- ldo RP%_fini(%r22), %r22
- stw %r22, -52(%sp)
-
- /* void *stack_end */
+ /* void *stack_end (7th argument) */
stw %sp, -60(%sp)
/* load global */
More information about the uClibc-cvs
mailing list