From owner-svn-src-all@freebsd.org  Fri Nov 24 14:02:34 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 34A96DE72F6;
 Fri, 24 Nov 2017 14:02:34 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 01B8476294;
 Fri, 24 Nov 2017 14:02:33 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAOE2XjT039813;
 Fri, 24 Nov 2017 14:02:33 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAOE2XkX039812;
 Fri, 24 Nov 2017 14:02:33 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201711241402.vAOE2XkX039812@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ed set sender to ed@FreeBSD.org
 using -f
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 24 Nov 2017 14:02:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r326167 - head/sys/modules/cloudabi32
X-SVN-Group: head
X-SVN-Commit-Author: ed
X-SVN-Commit-Paths: head/sys/modules/cloudabi32
X-SVN-Commit-Revision: 326167
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Nov 2017 14:02:34 -0000

Author: ed
Date: Fri Nov 24 14:02:32 2017
New Revision: 326167
URL: https://svnweb.freebsd.org/changeset/base/326167

Log:
  Pick the right vDSO file/linker flags when building cloudabi32.ko on ARM64.
  
  The recently imported cloudabi_vdso_armv6_on_64bit.S should be the vDSO
  for 32-bit processes when being run on FreeBSD/arm64. This vDSO ensures
  that all system call arguments are padded to 64 bits, so that they can
  be used by the kernel to call into most of the native implementations
  directly.

Modified:
  head/sys/modules/cloudabi32/Makefile

Modified: head/sys/modules/cloudabi32/Makefile
==============================================================================
--- head/sys/modules/cloudabi32/Makefile	Fri Nov 24 13:51:59 2017	(r326166)
+++ head/sys/modules/cloudabi32/Makefile	Fri Nov 24 14:02:32 2017	(r326167)
@@ -14,7 +14,11 @@ SRCS=	cloudabi32_fd.c cloudabi32_module.c cloudabi32_p
 OBJS=	cloudabi32_vdso_blob.o
 CLEANFILES=cloudabi32_vdso.o
 
-.if ${MACHINE_CPUARCH} == "amd64"
+.if ${MACHINE_CPUARCH} == "aarch64"
+VDSO_SRCS=${SYSDIR}/contrib/cloudabi/cloudabi_vdso_armv6_on_64bit.S
+OUTPUT_TARGET=elf64-littleaarch64
+BINARY_ARCHITECTURE=aarch64
+.elif ${MACHINE_CPUARCH} == "amd64"
 VDSO_SRCS=${SYSDIR}/contrib/cloudabi/cloudabi_vdso_i686_on_64bit.S
 OUTPUT_TARGET=elf64-x86-64-freebsd
 BINARY_ARCHITECTURE=i386