|
 |
08c3a6 |
commit bb4148283fa7c52fbc7efe19e81cd129adc7fd61
|
|
|
08c3a6 |
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
|
08c3a6 |
Date: Thu May 26 13:12:21 2022 -0300
|
|
|
08c3a6 |
|
|
|
08c3a6 |
nios2: Remove _dl_skip_args usage (BZ# 29187)
|
|
|
08c3a6 |
|
|
|
08c3a6 |
Since ad43cac44a the generic code already shuffles the argv/envp/auxv
|
|
|
08c3a6 |
on the stack to remove the ld.so own arguments and thus _dl_skip_args
|
|
|
08c3a6 |
is always 0. So there is no need to adjust the argc or argv.
|
|
|
08c3a6 |
|
|
|
08c3a6 |
Checked with qemu-user that arguments are correctly passed on both
|
|
|
08c3a6 |
constructors and main program.
|
|
|
08c3a6 |
|
|
|
08c3a6 |
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
|
|
|
08c3a6 |
(cherry picked from commit 4868ba5d257a7fb415674e79c4ae5a3af2827f55)
|
|
|
08c3a6 |
|
|
|
08c3a6 |
diff --git a/sysdeps/nios2/dl-machine.h b/sysdeps/nios2/dl-machine.h
|
|
|
08c3a6 |
index 430ca5d7ae1e0372..47b3f6acd7624bcb 100644
|
|
|
08c3a6 |
--- a/sysdeps/nios2/dl-machine.h
|
|
|
08c3a6 |
+++ b/sysdeps/nios2/dl-machine.h
|
|
|
08c3a6 |
@@ -128,53 +128,23 @@ _start:\n\
|
|
|
08c3a6 |
ldw r8, %call(_dl_nios2_get_gp_value)(r22)\n\
|
|
|
08c3a6 |
callr r8\n\
|
|
|
08c3a6 |
mov gp, r2\n\
|
|
|
08c3a6 |
-\n\
|
|
|
08c3a6 |
- /* Find the number of arguments to skip. */\n\
|
|
|
08c3a6 |
- ldw r8, %got(_dl_skip_args)(r22)\n\
|
|
|
08c3a6 |
- ldw r8, 0(r8)\n\
|
|
|
08c3a6 |
\n\
|
|
|
08c3a6 |
/* Find the main_map from the GOT. */\n\
|
|
|
08c3a6 |
ldw r4, %got(_rtld_local)(r22)\n\
|
|
|
08c3a6 |
ldw r4, 0(r4)\n\
|
|
|
08c3a6 |
\n\
|
|
|
08c3a6 |
- /* Find argc. */\n\
|
|
|
08c3a6 |
- ldw r5, 0(sp)\n\
|
|
|
08c3a6 |
- sub r5, r5, r8\n\
|
|
|
08c3a6 |
- stw r5, 0(sp)\n\
|
|
|
08c3a6 |
-\n\
|
|
|
08c3a6 |
- /* Find the first unskipped argument. */\n\
|
|
|
08c3a6 |
- slli r8, r8, 2\n\
|
|
|
08c3a6 |
- addi r6, sp, 4\n\
|
|
|
08c3a6 |
- add r9, r6, r8\n\
|
|
|
08c3a6 |
- mov r10, r6\n\
|
|
|
08c3a6 |
-\n\
|
|
|
08c3a6 |
- /* Shuffle argv down. */\n\
|
|
|
08c3a6 |
-3: ldw r11, 0(r9)\n\
|
|
|
08c3a6 |
- stw r11, 0(r10)\n\
|
|
|
08c3a6 |
- addi r9, r9, 4\n\
|
|
|
08c3a6 |
- addi r10, r10, 4\n\
|
|
|
08c3a6 |
- bne r11, zero, 3b\n\
|
|
|
08c3a6 |
+ /* Load adjusted argc. */\n\
|
|
|
08c3a6 |
+ ldw r2, %got(_dl_argc)(r22)\n\
|
|
|
08c3a6 |
+ ldw r5, 0(r2)\n\
|
|
|
08c3a6 |
\n\
|
|
|
08c3a6 |
- /* Shuffle envp down. */\n\
|
|
|
08c3a6 |
- mov r7, r10\n\
|
|
|
08c3a6 |
-4: ldw r11, 0(r9)\n\
|
|
|
08c3a6 |
- stw r11, 0(r10)\n\
|
|
|
08c3a6 |
- addi r9, r9, 4\n\
|
|
|
08c3a6 |
- addi r10, r10, 4\n\
|
|
|
08c3a6 |
- bne r11, zero, 4b\n\
|
|
|
08c3a6 |
-\n\
|
|
|
08c3a6 |
- /* Shuffle auxv down. */\n\
|
|
|
08c3a6 |
-5: ldw r11, 4(r9)\n\
|
|
|
08c3a6 |
- stw r11, 4(r10)\n\
|
|
|
08c3a6 |
- ldw r11, 0(r9)\n\
|
|
|
08c3a6 |
- stw r11, 0(r10)\n\
|
|
|
08c3a6 |
- addi r9, r9, 8\n\
|
|
|
08c3a6 |
- addi r10, r10, 8\n\
|
|
|
08c3a6 |
- bne r11, zero, 5b\n\
|
|
|
08c3a6 |
-\n\
|
|
|
08c3a6 |
- /* Update _dl_argv. */\n\
|
|
|
08c3a6 |
+ /* Load adjsuted argv. */\n\
|
|
|
08c3a6 |
ldw r2, %got(_dl_argv)(r22)\n\
|
|
|
08c3a6 |
- stw r6, 0(r2)\n\
|
|
|
08c3a6 |
+ ldw r6, 0(r2)\n\
|
|
|
08c3a6 |
+\n\
|
|
|
08c3a6 |
+ /* envp = argv + argc + 1 */\n\
|
|
|
08c3a6 |
+ addi r7, r5, 1\n\
|
|
|
08c3a6 |
+ slli r7, r7, 2\n\
|
|
|
08c3a6 |
+ add r7, r7, r6\n\
|
|
|
08c3a6 |
\n\
|
|
|
08c3a6 |
/* Call _dl_init through the PLT. */\n\
|
|
|
08c3a6 |
ldw r8, %call(_dl_init)(r22)\n\
|