summaryrefslogtreecommitdiffstats
path: root/sys/arm64
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2016-10-12 12:17:41 +0000
committered <ed@FreeBSD.org>2016-10-12 12:17:41 +0000
commitcd04fbc5e631c6b3e80a14eb7044c3be35fba2d2 (patch)
tree3ca9a0abae801f8646949bec9130ff7ff712b5ca /sys/arm64
parent82a188c72f465e7dca16363000c51faf4b1cb5f3 (diff)
downloadFreeBSD-src-cd04fbc5e631c6b3e80a14eb7044c3be35fba2d2.zip
FreeBSD-src-cd04fbc5e631c6b3e80a14eb7044c3be35fba2d2.tar.gz
MFC r303818, r303833, r303941, r304478, r304481, r304483, r304484, r304554,
r304555, r304556, r304557, r304558, r304559, r304561, r304563, r304564, r304565, r304615, r304742, r304743, r304744, r304745, r304748, r304886, r304991, r305928, r305938, r305987, r306185: Bring CloudABI support back in sync with HEAD. - Add support for running 32-bit executables on amd64, armv6 and i386. - As these new architectures require the use of the vDSO, merge back vDSO support for 64-bit executables running on amd64 and arm64 as well. This has the advantage that support for vDSO-less execution can be phased out when 11.0 becomes unsupported, as opposed to 11.x. This change has been tested by running the cloudlibc unit tests on all supported architectures, which seems to work fine.
Diffstat (limited to 'sys/arm64')
-rw-r--r--sys/arm64/cloudabi64/cloudabi64_sysvec.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/arm64/cloudabi64/cloudabi64_sysvec.c b/sys/arm64/cloudabi64/cloudabi64_sysvec.c
index cf3e594..79b1046 100644
--- a/sys/arm64/cloudabi64/cloudabi64_sysvec.c
+++ b/sys/arm64/cloudabi64/cloudabi64_sysvec.c
@@ -139,9 +139,9 @@ cloudabi64_thread_setregs(struct thread *td,
stack_t stack;
/* Perform standard register initialization. */
- stack.ss_sp = (void *)attr->stack;
+ stack.ss_sp = TO_PTR(attr->stack);
stack.ss_size = attr->stack_size;
- cpu_set_upcall(td, (void *)attr->entry_point, NULL, &stack);
+ cpu_set_upcall(td, TO_PTR(attr->entry_point), NULL, &stack);
/*
* Pass in the thread ID of the new thread and the argument
@@ -165,7 +165,6 @@ static struct sysentvec cloudabi64_elf_sysvec = {
.sv_pagesize = PAGE_SIZE,
.sv_minuser = VM_MIN_ADDRESS,
.sv_maxuser = VM_MAXUSER_ADDRESS,
- .sv_usrstack = USRSTACK,
.sv_stackprot = VM_PROT_READ | VM_PROT_WRITE,
.sv_copyout_strings = cloudabi64_copyout_strings,
.sv_setregs = cloudabi64_proc_setregs,
OpenPOWER on IntegriCloud