From owner-svn-src-all@freebsd.org  Mon Aug 29 07:48:36 2016
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 DB2BFB77100;
 Mon, 29 Aug 2016 07:48:36 +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 AC2AE1F7;
 Mon, 29 Aug 2016 07:48:36 +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 u7T7mZos003131;
 Mon, 29 Aug 2016 07:48:35 GMT (envelope-from ed@FreeBSD.org)
Received: (from ed@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7T7mZMW003129;
 Mon, 29 Aug 2016 07:48:35 GMT (envelope-from ed@FreeBSD.org)
Message-Id: <201608290748.u7T7mZMW003129@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: Mon, 29 Aug 2016 07:48:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r304991 - in head/sys/modules: cloudabi32 cloudabi64
X-SVN-Group: head
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.22
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: Mon, 29 Aug 2016 07:48:37 -0000

Author: ed
Date: Mon Aug 29 07:48:35 2016
New Revision: 304991
URL: https://svnweb.freebsd.org/changeset/base/304991

Log:
  Use both the MACHINE and MACHINE_CPUARCH directories for finding sources.
  
  When fixing this module to build on PC98, I actually broke the build on
  ARM64. On PC98 we need to pull in the sources from the MACHINE_CPUARCH
  (i386), but on ARM64 we need to use the MACHINE, as MACHINE_CPUARCH is
  set to aarch64 instead of just arm64.

Modified:
  head/sys/modules/cloudabi32/Makefile
  head/sys/modules/cloudabi64/Makefile

Modified: head/sys/modules/cloudabi32/Makefile
==============================================================================
--- head/sys/modules/cloudabi32/Makefile	Mon Aug 29 07:46:23 2016	(r304990)
+++ head/sys/modules/cloudabi32/Makefile	Mon Aug 29 07:48:35 2016	(r304991)
@@ -4,6 +4,7 @@ SYSDIR?=${.CURDIR}/../..
 
 .PATH: ${SYSDIR}/compat/cloudabi32
 .PATH: ${SYSDIR}/${MACHINE_CPUARCH}/cloudabi32
+.PATH: ${SYSDIR}/${MACHINE}/cloudabi32
 
 KMOD=	cloudabi32
 SRCS=	cloudabi32_fd.c cloudabi32_module.c cloudabi32_poll.c \

Modified: head/sys/modules/cloudabi64/Makefile
==============================================================================
--- head/sys/modules/cloudabi64/Makefile	Mon Aug 29 07:46:23 2016	(r304990)
+++ head/sys/modules/cloudabi64/Makefile	Mon Aug 29 07:48:35 2016	(r304991)
@@ -4,6 +4,7 @@ SYSDIR?=${.CURDIR}/../..
 
 .PATH: ${SYSDIR}/compat/cloudabi64
 .PATH: ${SYSDIR}/${MACHINE_CPUARCH}/cloudabi64
+.PATH: ${SYSDIR}/${MACHINE}/cloudabi64
 
 KMOD=	cloudabi64
 SRCS=	cloudabi64_fd.c cloudabi64_module.c cloudabi64_poll.c \