mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

arm: Remove _dl_skip_args usage

Browse Source 
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.

Checked with qemu-user that arguments are correctly passed on both
constructors and main program.

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

39
sysdeps/arm/dl-machine.h
View File

@ -130,9 +130,6 @@ elf_machine_runtime_setup (struct link_map *l, struct r_scope_elem *scope[],
_start:\n\ _start:\n\
@ we are PIC code, so get global offset table\n\ @ we are PIC code, so get global offset table\n\
ldr sl, .L_GET_GOT\n\ ldr sl, .L_GET_GOT\n\
@ See if we were run as a command with the executable file\n\
@ name as an extra leading argument.\n\
ldr r4, .L_SKIP_ARGS\n\
@ at start time, all the args are on the stack\n\ @ at start time, all the args are on the stack\n\
mov r0, sp\n\ mov r0, sp\n\
bl _dl_start\n\ bl _dl_start\n\
@ -147,10 +144,6 @@ _dl_start_user:\n\
ldr r1, [sp]\n\ ldr r1, [sp]\n\
@ get the argv address\n\ @ get the argv address\n\
add r2, sp, #4\n\ add r2, sp, #4\n\
@ Fix up the stack if necessary.\n\
cmp r4, #0\n\
bne .L_fixup_stack\n\
.L_done_fixup:\n\
@ compute envp\n\ @ compute envp\n\
add r3, r2, r1, lsl #2\n\ add r3, r2, r1, lsl #2\n\
add r3, r3, #4\n\ add r3, r3, #4\n\
@ -164,41 +157,9 @@ _dl_start_user:\n\
add r0, sl, r0\n\ add r0, sl, r0\n\
@ jump to the user_s entry point\n\ @ jump to the user_s entry point\n\
" BX(r6) "\n\ " BX(r6) "\n\
\n\
@ iWMMXt and EABI targets require the stack to be eight byte\n\
@ aligned - shuffle arguments etc.\n\
.L_fixup_stack:\n\
@ subtract _dl_skip_args from original arg count\n\
sub r1, r1, r4\n\
@ store the new argc in the new stack location\n\
str r1, [sp]\n\
@ find the first unskipped argument\n\
mov r3, r2\n\
add r4, r2, r4, lsl #2\n\
@ shuffle argv down\n\
1: ldr r5, [r4], #4\n\
str r5, [r3], #4\n\
cmp r5, #0\n\
bne 1b\n\
@ shuffle envp down\n\
1: ldr r5, [r4], #4\n\
str r5, [r3], #4\n\
cmp r5, #0\n\
bne 1b\n\
@ shuffle auxv down\n\
1: ldmia r4!, {r0, r5}\n\
stmia r3!, {r0, r5}\n\
cmp r0, #0\n\
bne 1b\n\
@ Update _dl_argv\n\
ldr r3, .L_ARGV\n\
str r2, [sl, r3]\n\
b .L_done_fixup\n\
\n\ \n\
.L_GET_GOT:\n\ .L_GET_GOT:\n\
.word _GLOBAL_OFFSET_TABLE_ - .L_GET_GOT\n\ .word _GLOBAL_OFFSET_TABLE_ - .L_GET_GOT\n\
.L_SKIP_ARGS:\n\
.word _dl_skip_args(GOTOFF)\n\
.L_FINI_PROC:\n\ .L_FINI_PROC:\n\
.word _dl_fini(GOTOFF)\n\ .word _dl_fini(GOTOFF)\n\
.L_ARGV:\n\ .L_ARGV:\n\