diff options
| author | andrew <andrew@FreeBSD.org> | 2016-01-13 15:54:17 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2016-01-13 15:54:17 +0000 |
| commit | 8298ebeec0910da6d4fb708e762ffc9738a4df64 (patch) | |
| tree | 2f5baf1b6f5b331cf40ca78dcb90f8d78f9170aa | |
| parent | a5374736080aa34caf5246a38d92b5fd4c3d4d4f (diff) | |
| download | FreeBSD-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
| -rw-r--r-- | lib/csu/aarch64/crt1.c | 6 | ||||
| -rw-r--r-- | libexec/rtld-elf/aarch64/rtld_start.S | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/lib/csu/aarch64/crt1.c b/lib/csu/aarch64/crt1.c index ed24f46..40279b7 100644 --- a/lib/csu/aarch64/crt1.c +++ b/lib/csu/aarch64/crt1.c @@ -54,11 +54,7 @@ __asm(" .text \n" " .align 0 \n" " .globl _start \n" " _start: \n" -/* TODO: Remove this when the kernel correctly aligns the stack */ -" cbnz x0, 1f \n" /* Are we using a new kernel? */ -" mov x0, sp \n" /* No, load the args from sp */ -" and sp, x0, #~0xf \n" /* And align the stack */ -"1: mov x3, x2 \n" /* cleanup */ +" mov x3, x2 \n" /* cleanup */ " add x1, x0, #8 \n" /* load argv */ " ldr x0, [x0] \n" /* load argc */ " add x2, x1, x0, lsl #3 \n" /* env is after argv */ 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 */ |
