c2879fd933
* Thu Jan 13 2022 Florian Weimer <fweimer@redhat.com> - 2.34-18 - Backport optimized ELF dependency sorting algorithm (#2032647) * Thu Jan 13 2022 Florian Weimer <fweimer@redhat.com> - 2.34-17 - Sync with upstream branch release/2.34/master, commit 2fe2af88abd13ae5636881da2e26f461ecb7dfb5 - i386: Remove broken CAN_USE_REGISTER_ASM_EBP (bug 28771) - Update syscall lists for Linux 5.15 - powerpc: Fix unrecognized instruction errors with recent GCC - timezone: test-case for BZ #28707 - timezone: handle truncated timezones from tzcode-2021d and later (BZ #28707) - Fix subscript error with odd TZif file [BZ #28338] - AArch64: Check for SVE in ifuncs [BZ #28744] - intl/plural.y: Avoid conflicting declarations of yyerror and yylex - Linux: Fix 32-bit vDSO for clock_gettime on powerpc32 - linux: Add sparck brk implementation - Update sparc libm-test-ulps - Update hppa libm-test-ulps - riscv: align stack before calling _dl_init [BZ #28703] - riscv: align stack in clone [BZ #28702] - powerpc64[le]: Allocate extra stack frame on syscall.S - elf: Fix tst-cpu-features-cpuinfo for KVM guests on some AMD systems [BZ #28704] - nss: Use "files dns" as the default for the hosts database (bug 28700) - arm: Guard ucontext _rtld_global_ro access by SHARED, not PIC macro - mips: increase stack alignment in clone to match the ABI - mips: align stack in clone [BZ #28223] Resolves: #2032647 Resolves: #2033649
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
commit aa3a97496c82a8443039248ebee650322c9480f4
|
|
Author: Aurelien Jarno <aurelien@aurel32.net>
|
|
Date: Thu Dec 16 00:06:28 2021 +0100
|
|
|
|
riscv: align stack before calling _dl_init [BZ #28703]
|
|
|
|
Align the stack pointer to 128 bits during the call to _dl_init() as
|
|
specified by the RISC-V ABI [1]. This fixes the elf/tst-align2 test.
|
|
|
|
Fixes bug 28703.
|
|
|
|
[1] https://github.com/riscv-non-isa/riscv-elf-psabi-doc
|
|
|
|
(cherry picked from commit 225da459cebef1037dcd78b56471edc0721e1c41)
|
|
|
|
diff --git a/sysdeps/riscv/dl-machine.h b/sysdeps/riscv/dl-machine.h
|
|
index aedf69fcdd8aff50..951268923da26a37 100644
|
|
--- a/sysdeps/riscv/dl-machine.h
|
|
+++ b/sysdeps/riscv/dl-machine.h
|
|
@@ -127,8 +127,14 @@ elf_machine_load_address (void)
|
|
sll a3, a1, " STRINGXP (PTRLOG) "\n\
|
|
add a3, a3, a2\n\
|
|
add a3, a3, " STRINGXP (SZREG) "\n\
|
|
+ # Stash the stack pointer in s1.\n\
|
|
+ mv s1, sp\n\
|
|
+ # Align stack to 128 bits for the _dl_init call.\n\
|
|
+ andi sp, sp,-16\n\
|
|
# Call the function to run the initializers.\n\
|
|
jal _dl_init\n\
|
|
+ # Restore the stack pointer for _start.\n\
|
|
+ mv sp, s1\n\
|
|
# Pass our finalizer function to _start.\n\
|
|
lla a0, _dl_fini\n\
|
|
# Jump to the user entry point.\n\
|