svn commit: r297470 - in head/sys: amd64/cloudabi64 arm64/cloudabi64 compat/cloudabi64

Ed Schouten ed at FreeBSD.org
Thu Mar 31 18:52:02 UTC 2016


Author: ed
Date: Thu Mar 31 18:52:00 2016
New Revision: 297470
URL: https://svnweb.freebsd.org/changeset/base/297470

Log:
  Make Position Independent Executables work for CloudABI.
  
  - Set BI_CAN_EXEC_DYN, so we can execute ET_DYN ELF files in addition to
    regular ET_EXECs.
  - Provide an AT_BASE entry in the auxiliary vector, so the executable
    knows at which address it got loaded and can apply relocations.

Modified:
  head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
  head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
  head/sys/compat/cloudabi64/cloudabi64_module.c

Modified: head/sys/amd64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- head/sys/amd64/cloudabi64/cloudabi64_sysvec.c	Thu Mar 31 18:50:52 2016	(r297469)
+++ head/sys/amd64/cloudabi64/cloudabi64_sysvec.c	Thu Mar 31 18:52:00 2016	(r297470)
@@ -156,5 +156,6 @@ Elf64_Brandinfo cloudabi64_brand = {
 	.brand		= ELFOSABI_CLOUDABI,
 	.machine	= EM_X86_64,
 	.sysvec		= &cloudabi64_elf_sysvec,
+	.flags		= BI_CAN_EXEC_DYN,
 	.compat_3_brand	= "CloudABI",
 };

Modified: head/sys/arm64/cloudabi64/cloudabi64_sysvec.c
==============================================================================
--- head/sys/arm64/cloudabi64/cloudabi64_sysvec.c	Thu Mar 31 18:50:52 2016	(r297469)
+++ head/sys/arm64/cloudabi64/cloudabi64_sysvec.c	Thu Mar 31 18:52:00 2016	(r297470)
@@ -157,5 +157,6 @@ Elf64_Brandinfo cloudabi64_brand = {
 	.brand		= ELFOSABI_CLOUDABI,
 	.machine	= EM_AARCH64,
 	.sysvec		= &cloudabi64_elf_sysvec,
+	.flags		= BI_CAN_EXEC_DYN,
 	.compat_3_brand	= "CloudABI",
 };

Modified: head/sys/compat/cloudabi64/cloudabi64_module.c
==============================================================================
--- head/sys/compat/cloudabi64/cloudabi64_module.c	Thu Mar 31 18:50:52 2016	(r297469)
+++ head/sys/compat/cloudabi64/cloudabi64_module.c	Thu Mar 31 18:52:00 2016	(r297470)
@@ -99,6 +99,7 @@ cloudabi64_fixup(register_t **stack_base
 #define	PTR(type, ptr)	{ .a_type = (type), .a_ptr = (uintptr_t)(ptr) }
 		PTR(CLOUDABI_AT_ARGDATA, argdata),
 		VAL(CLOUDABI_AT_ARGDATALEN, argdatalen),
+		VAL(CLOUDABI_AT_BASE, args->base),
 		PTR(CLOUDABI_AT_CANARY, canary),
 		VAL(CLOUDABI_AT_CANARYLEN, sizeof(canarybuf)),
 		VAL(CLOUDABI_AT_NCPUS, mp_ncpus),


More information about the svn-src-head mailing list