svn commit: r306185 - in head: share/man/man4 sys/modules sys/modules/cloudabi32

[Ed Schouten]

Author: ed
Date: Thu Sep 22 12:08:26 2016
New Revision: 306185
URL: https://svnweb.freebsd.org/changeset/base/306185

Log:
  Make the cloudabi32 kernel module available on ARMv6.
  
  Now that all of the necessary bits for ARMv6 support for CloudABI have
  been checked in, let's hook the kernel module up to the build and
  document its existence.

Modified:
  head/share/man/man4/cloudabi.4
  head/sys/modules/Makefile
  head/sys/modules/cloudabi32/Makefile

Modified: head/share/man/man4/cloudabi.4
==============================================================================
--- head/share/man/man4/cloudabi.4	Thu Sep 22 11:54:20 2016	(r306184)
+++ head/share/man/man4/cloudabi.4	Thu Sep 22 12:08:26 2016	(r306185)
@@ -22,7 +22,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd August 24, 2016
+.Dd September 22, 2016
 .Dt CLOUDABI 4
 .Os
 .Sh NAME
@@ -84,7 +84,7 @@ module can be loaded on any architecture
 .Fx ,
 the
 .Nm cloudabi32
-module is only available on i386 and amd64.
+module is only available on amd64, armv6 and i386.
 The same holds for the
 .Nm cloudabi64
 module,

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Thu Sep 22 11:54:20 2016	(r306184)
+++ head/sys/modules/Makefile	Thu Sep 22 12:08:26 2016	(r306185)
@@ -768,7 +768,8 @@ _epic=		epic
 _igb=		igb
 .endif
 
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+.if (${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "armv6" || \
+     ${MACHINE_CPUARCH} == "i386")
 _cloudabi32=	cloudabi32
 .endif
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64"

Modified: head/sys/modules/cloudabi32/Makefile
==============================================================================
--- head/sys/modules/cloudabi32/Makefile	Thu Sep 22 11:54:20 2016	(r306184)
+++ head/sys/modules/cloudabi32/Makefile	Thu Sep 22 12:08:26 2016	(r306185)
@@ -14,14 +14,18 @@ SRCS=	cloudabi32_fd.c cloudabi32_module.
 OBJS=	cloudabi32_vdso_blob.o
 CLEANFILES=cloudabi32_vdso.o
 
-.if ${MACHINE_CPUARCH} == "i386"
-VDSO_SRCS=${SYSDIR}/contrib/cloudabi/cloudabi_vdso_i686.S
-OUTPUT_TARGET=elf32-i386-freebsd
-BINARY_ARCHITECTURE=aarch32
-.elif ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "amd64"
 VDSO_SRCS=${SYSDIR}/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
 OUTPUT_TARGET=elf64-x86-64-freebsd
 BINARY_ARCHITECTURE=i386
+.elif ${MACHINE_ARCH} == "armv6"
+VDSO_SRCS=${SYSDIR}/contrib/cloudabi/cloudabi_vdso_armv6.S
+OUTPUT_TARGET=elf32-littlearm
+BINARY_ARCHITECTURE=arm
+.elif ${MACHINE_CPUARCH} == "i386"
+VDSO_SRCS=${SYSDIR}/contrib/cloudabi/cloudabi_vdso_i686.S
+OUTPUT_TARGET=elf32-i386-freebsd
+BINARY_ARCHITECTURE=i386
 .endif
 
 cloudabi32_vdso.o: ${VDSO_SRCS}