qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

csky: Remove _dl_skip_args usage 

Since ad43cac44a the generic code already shuffles the argv/envp/auxv
on the stack to remove the ld.so own arguments and thus _dl_skip_args
is always 0.  It makes the fixup_stack branch ununsed.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella 2022-05-26 13:06:06 -03:00
parent f20464e9e4
commit 00477963c6
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sysdeps/csky/dl-machine.h
View File

@ -113,11 +113,7 @@ _start:\n\
addu t1, gb\n\ addu t1, gb\n\
jsr t1\n\ jsr t1\n\
_dl_start_user:\n\ _dl_start_user:\n\
/* get _dl_skip_args */ \n\ /* store program entry address in r10 */ \n\
lrw r11, _dl_skip_args@GOTOFF\n\
addu r11, gb\n\
ldw r11, (r11, 0)\n\
/* store program entry address in r11 */ \n\
mov r10, a0\n\ mov r10, a0\n\
/* Get argc */\n\ /* Get argc */\n\
ldw a1, (sp, 0)\n\ ldw a1, (sp, 0)\n\
@ -125,8 +121,6 @@ _dl_start_user:\n\
mov a2, sp\n\ mov a2, sp\n\
addi a2, 4\n\ addi a2, 4\n\
cmpnei r11, 0\n\ cmpnei r11, 0\n\
bt .L_fixup_stack\n\
.L_done_fixup:\n\
mov a3, a1\n\ mov a3, a1\n\
lsli a3, 2\n\ lsli a3, 2\n\
add a3, a2\n\ add a3, a2\n\
@ -141,17 +135,6 @@ _dl_start_user:\n\
lrw a0, _dl_fini@GOTOFF\n\ lrw a0, _dl_fini@GOTOFF\n\
addu a0, gb\n\ addu a0, gb\n\
jmp r10\n\ jmp r10\n\
.L_fixup_stack:\n\
subu a1, r11\n\
lsli r11, 2\n\
addu sp, r11\n\
stw a1, (sp, 0)\n\
mov a2, sp\n\
addi a2, 4\n\
lrw a3, _dl_argv@GOTOFF\n\
addu a3, gb\n\
stw a2, (a3, 0)\n\
br .L_done_fixup\n\
"); ");
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or /* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or