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

arc: 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.  So there is no need to adjust the argc or argv.

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

17
sysdeps/arc/dl-machine.h
View File

@ -161,29 +161,16 @@ __start: \n\
bl.d _dl_start \n\ bl.d _dl_start \n\
mov_s r0, sp /* pass ptr to aux vector tbl. */ \n\ mov_s r0, sp /* pass ptr to aux vector tbl. */ \n\
mov r13, r0 /* safekeep app elf entry point. */ \n\ mov r13, r0 /* safekeep app elf entry point. */ \n\
\n\
/* (2). If ldso ran with executable as arg. */ \n\
/* skip the extra args calc by dl_start. */ \n\
ld_s r1, [sp] /* orig argc. */ \n\ ld_s r1, [sp] /* orig argc. */ \n\
ld r12, [pcl, _dl_skip_args@pcl] \n\
breq r12, 0, 1f \n\
\n\ \n\
add2 sp, sp, r12 /* discard argv entries from stack. */ \n\ /* (2). call preinit stuff. */ \n\
sub_s r1, r1, r12 /* adjusted argc on stack. */ \n\
st_s r1, [sp] \n\
add r2, sp, 4 \n\
/* intermediate LD for ST emcoding limitations. */ \n\
ld r3, [pcl, _dl_argv@gotpc] \n\
st r2, [r3] \n\
1: \n\
/* (3). call preinit stuff. */ \n\
ld r0, [pcl, _rtld_local@pcl] \n\ ld r0, [pcl, _rtld_local@pcl] \n\
add r2, sp, 4 ; argv \n\ add r2, sp, 4 ; argv \n\
add2 r3, r2, r1 \n\ add2 r3, r2, r1 \n\
add r3, r3, 4 ; env \n\ add r3, r3, 4 ; env \n\
bl _dl_init@plt \n\ bl _dl_init@plt \n\
\n\ \n\
/* (4) call app elf entry point. */ \n\ /* (3) call app elf entry point. */ \n\
add r0, pcl, _dl_fini@pcl \n\ add r0, pcl, _dl_fini@pcl \n\
j [r13] \n\ j [r13] \n\
\n\ \n\