summaryrefslogtreecommitdiffstats
path: root/libexec/rtld-elf
diff options
context:
space:
mode:
authorandrew <andrew@FreeBSD.org>2016-01-13 15:54:17 +0000
committerandrew <andrew@FreeBSD.org>2016-01-13 15:54:17 +0000
commit8298ebeec0910da6d4fb708e762ffc9738a4df64 (patch)
tree2f5baf1b6f5b331cf40ca78dcb90f8d78f9170aa /libexec/rtld-elf
parenta5374736080aa34caf5246a38d92b5fd4c3d4d4f (diff)
downloadFreeBSD-src-8298ebeec0910da6d4fb708e762ffc9738a4df64.zip
FreeBSD-src-8298ebeec0910da6d4fb708e762ffc9738a4df64.tar.gz
Remove the compat code to handle the kernel passing us an unalinged
stackpointer. Userland expects the kernel to pass it an aligned sp and pass a pointer to the arguments in x0. The kernel side was updated in r289502, 3 months ago. Sponsored by: ABT Systems Ltd
Diffstat (limited to 'libexec/rtld-elf')
-rw-r--r--libexec/rtld-elf/aarch64/rtld_start.S8
1 files changed, 1 insertions, 7 deletions
diff --git a/libexec/rtld-elf/aarch64/rtld_start.S b/libexec/rtld-elf/aarch64/rtld_start.S
index 2270efc..41397f9 100644
--- a/libexec/rtld-elf/aarch64/rtld_start.S
+++ b/libexec/rtld-elf/aarch64/rtld_start.S
@@ -34,13 +34,7 @@ ENTRY(.rtld_start)
mov x19, x0 /* Put ps_strings in a callee-saved register */
mov x20, sp /* And the stack pointer */
- /* Handle the old style stack */
- /* TODO: Remove this when the kernel correctly aligns the stack */
- cbnz x0, 1f
- mov x0, sp /* sp points to the args */
- and sp, x0, #~0xf /* Align the stack as needed */
-
-1: sub sp, sp, #16 /* Make room for obj_main & exit proc */
+ sub sp, sp, #16 /* Make room for obj_main & exit proc */
mov x1, sp /* exit_proc */
add x2, x1, #8 /* obj_main */
OpenPOWER on IntegriCloud