3aa2e0d8ed
* Tue Jun 14 2022 Arjun Shankar <arjun@redhat.com> - 2.34-38
- Sync with upstream branch release/2.34/master,
commit 94ab2088c37d8e4285354af120b7ed6b887b9e53:
- nss: handle stat failure in check_reload_and_get (BZ #28752)
- nss: add assert to DB_LOOKUP_FCT (BZ #28752)
- nios2: Remove _dl_skip_args usage (BZ# 29187)
- hppa: Remove _dl_skip_args usage (BZ# 29165)
- nptl: Fix __libc_cleanup_pop_restore asynchronous restore (BZ#29214)
Related: #2091541
Related: #2080163 (actually fixed in 601650f878, two commits ago)
84 lines
3.2 KiB
Diff
84 lines
3.2 KiB
Diff
commit 96944f0f81870b733f518950a108c7ad6b078da6
|
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
Date: Wed May 25 08:58:38 2022 -0300
|
|
|
|
hppa: Remove _dl_skip_args usage (BZ# 29165)
|
|
|
|
Different than other architectures, hppa creates an unrelated stack
|
|
frame where ld.so argc/argv adjustments done by ad43cac44a6860eaefc
|
|
is not done on the argc/argv saved/restore by _dl_start_user.
|
|
|
|
Instead load _dl_argc and _dl_argv directlty instead of adjust them
|
|
using _dl_skip_args value.
|
|
|
|
Checked on hppa-linux-gnu.
|
|
|
|
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
|
|
(cherry picked from commit 6242602273feb8d68cd51cff0ad21b3c8ee11fc6)
|
|
|
|
diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h
|
|
index ac66f044189edd18..df6269209f3268b7 100644
|
|
--- a/sysdeps/hppa/dl-machine.h
|
|
+++ b/sysdeps/hppa/dl-machine.h
|
|
@@ -374,10 +374,6 @@ asm ( \
|
|
"_start:\n" \
|
|
/* The kernel does not give us an initial stack frame. */ \
|
|
" ldo 64(%sp),%sp\n" \
|
|
- /* Save the relevant arguments (yes, those are the correct \
|
|
- registers, the kernel is weird) in their stack slots. */ \
|
|
-" stw %r25,-40(%sp)\n" /* argc */ \
|
|
-" stw %r24,-44(%sp)\n" /* argv */ \
|
|
\
|
|
/* We need the LTP, and we need it now. \
|
|
$PIC_pcrel$0 points 8 bytes past the current instruction, \
|
|
@@ -435,12 +431,7 @@ asm ( \
|
|
So, obviously, we can't just pass %sp to _dl_start. That's \
|
|
okay, argv-4 will do just fine. \
|
|
\
|
|
- The pleasant part of this is that if we need to skip \
|
|
- arguments we can just decrement argc and move argv, because \
|
|
- the stack pointer is utterly unrelated to the location of \
|
|
- the environment and argument vectors. */ \
|
|
- \
|
|
- /* This is always within range so we'll be okay. */ \
|
|
+ This is always within range so we'll be okay. */ \
|
|
" bl _dl_start,%rp\n" \
|
|
" ldo -4(%r24),%r26\n" \
|
|
\
|
|
@@ -450,22 +441,23 @@ asm ( \
|
|
/* Save the entry point in %r3. */ \
|
|
" copy %ret0,%r3\n" \
|
|
\
|
|
- /* See if we were called as a command with the executable file \
|
|
- name as an extra leading argument. */ \
|
|
-" addil LT'_dl_skip_args,%r19\n" \
|
|
-" ldw RT'_dl_skip_args(%r1),%r20\n" \
|
|
-" ldw 0(%r20),%r20\n" \
|
|
- \
|
|
-" ldw -40(%sp),%r25\n" /* argc */ \
|
|
-" comib,= 0,%r20,.Lnofix\n" /* FIXME: Mispredicted branch */\
|
|
-" ldw -44(%sp),%r24\n" /* argv (delay slot) */ \
|
|
+ /* The loader adjusts argc, argv, env, and the aux vectors \
|
|
+ directly on the stack to remove any arguments used for \
|
|
+ direct loader invocation. Thus, argc and argv must be \
|
|
+ reloaded from from _dl_argc and _dl_argv. */ \
|
|
\
|
|
-" sub %r25,%r20,%r25\n" \
|
|
+ /* Load argc from _dl_argc. */ \
|
|
+" addil LT'_dl_argc,%r19\n" \
|
|
+" ldw RT'_dl_argc(%r1),%r20\n" \
|
|
+" ldw 0(%r20),%r25\n" \
|
|
" stw %r25,-40(%sp)\n" \
|
|
-" sh2add %r20,%r24,%r24\n" \
|
|
+ \
|
|
+ /* Same for argv with _dl_argv. */ \
|
|
+" addil LT'_dl_argv,%r19\n" \
|
|
+" ldw RT'_dl_argv(%r1),%r20\n" \
|
|
+" ldw 0(%r20),%r24\n" \
|
|
" stw %r24,-44(%sp)\n" \
|
|
\
|
|
-".Lnofix:\n" \
|
|
/* Call _dl_init(main_map, argc, argv, envp). */ \
|
|
" addil LT'_rtld_local,%r19\n" \
|
|
" ldw RT'_rtld_local(%r1),%r26\n" \
|