diff options
author | mmel <mmel@FreeBSD.org> | 2018-04-04 02:30:00 +0000 |
---|---|---|
committer | mmel <mmel@FreeBSD.org> | 2018-04-04 02:30:00 +0000 |
commit | 83803b6c376528b8dae6f776fe3aec5be48ebced (patch) | |
tree | d3fc25ebc913cd08d086f9257afc142b0baf4bfa /libexec | |
parent | 2a3c026d17569aab336e0bbe09a5ee9d986bcb88 (diff) | |
download | FreeBSD-src-83803b6c376528b8dae6f776fe3aec5be48ebced.zip FreeBSD-src-83803b6c376528b8dae6f776fe3aec5be48ebced.tar.gz |
MFC r330073:
Make rtld_bind_start() debugger friendly. Save link register and annotate
call frame structure so debugger can unwind call frame created by
rtld_bind_start().
Diffstat (limited to 'libexec')
-rw-r--r-- | libexec/rtld-elf/aarch64/rtld_start.S | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/libexec/rtld-elf/aarch64/rtld_start.S b/libexec/rtld-elf/aarch64/rtld_start.S index 41397f9..b9577df 100644 --- a/libexec/rtld-elf/aarch64/rtld_start.S +++ b/libexec/rtld-elf/aarch64/rtld_start.S @@ -55,7 +55,15 @@ END(.rtld_start) * x17 = &_rtld_bind_start */ ENTRY(_rtld_bind_start) + .cfi_startproc mov x17, sp + + /* Save frame pointer and SP */ + stp x29, x30, [sp, #-16]! + mov x29, sp + .cfi_def_cfa x29, 16 + .cfi_offset x30, -8 + .cfi_offset x29, -16 /* Save the arguments */ stp x0, x1, [sp, #-16]! @@ -84,9 +92,6 @@ ENTRY(_rtld_bind_start) /* Call into rtld */ bl _rtld_bind - /* Restore the registers saved by the plt code */ - ldp xzr, x30, [sp, #(5 * 16 + 4 * 32)] - /* Backup the address to branch to */ mov x16, x0 @@ -100,11 +105,16 @@ ENTRY(_rtld_bind_start) ldp x4, x5, [sp], #16 ldp x2, x3, [sp], #16 ldp x0, x1, [sp], #16 - /* And the part of the stack the plt entry handled */ - add sp, sp, #16 + + /* Restore frame pointer */ + ldp x29, xzr, [sp], #16 + + /* Restore link register saved by the plt code */ + ldp xzr, x30, [sp], #16 /* Call into the correct function */ br x16 + .cfi_endproc END(_rtld_bind_start) /* |