From owner-svn-src-head@FreeBSD.ORG  Tue Jul 13 12:47:32 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A8C7106566C;
	Tue, 13 Jul 2010 12:47:32 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 348CD8FC13;
	Tue, 13 Jul 2010 12:47:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6DClWep028129;
	Tue, 13 Jul 2010 12:47:32 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6DClWcp028124;
	Tue, 13 Jul 2010 12:47:32 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201007131247.o6DClWcp028124@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 13 Jul 2010 12:47:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209991 - in head/sys/modules: . cas hwpmc sound/driver
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jul 2010 12:47:32 -0000

Author: nwhitehorn
Date: Tue Jul 13 12:47:31 2010
New Revision: 209991
URL: http://svn.freebsd.org/changeset/base/209991

Log:
  Make kernel modules build correctly on 64-bit PowerPC.

Modified:
  head/sys/modules/Makefile
  head/sys/modules/cas/Makefile
  head/sys/modules/hwpmc/Makefile
  head/sys/modules/sound/driver/Makefile

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Tue Jul 13 12:46:06 2010	(r209990)
+++ head/sys/modules/Makefile	Tue Jul 13 12:47:31 2010	(r209991)
@@ -318,7 +318,7 @@ SUBDIR=	${_3dfx} \
 	${_zfs} \
 	zlib \
 
-.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "arm" && \
+.if ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_ARCH} != "arm" && \
 	${MACHINE_ARCH} != "mips"
 _syscons=	syscons
 _vpo=		vpo
@@ -615,7 +615,7 @@ _wi=		wi
 _xe=		xe
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} == "powerpc"
 _an=		an
 _bm=		bm
 _cpufreq=	cpufreq

Modified: head/sys/modules/cas/Makefile
==============================================================================
--- head/sys/modules/cas/Makefile	Tue Jul 13 12:46:06 2010	(r209990)
+++ head/sys/modules/cas/Makefile	Tue Jul 13 12:47:31 2010	(r209991)
@@ -5,7 +5,7 @@
 KMOD=	if_cas
 SRCS=	bus_if.h device_if.h if_cas.c miibus_if.h pci_if.h ${ofw_bus_if}
 
-.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
+.if ${MACHINE_CPUARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64"
 ofw_bus_if=	ofw_bus_if.h
 .endif
 

Modified: head/sys/modules/hwpmc/Makefile
==============================================================================
--- head/sys/modules/hwpmc/Makefile	Tue Jul 13 12:46:06 2010	(r209990)
+++ head/sys/modules/hwpmc/Makefile	Tue Jul 13 12:47:31 2010	(r209991)
@@ -28,7 +28,7 @@ SRCS+=	device_if.h bus_if.h
 SRCS+=	hwpmc_ia64.c
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} == "powerpc"
 SRCS+=	hwpmc_powerpc.c
 .endif
 

Modified: head/sys/modules/sound/driver/Makefile
==============================================================================
--- head/sys/modules/sound/driver/Makefile	Tue Jul 13 12:46:06 2010	(r209990)
+++ head/sys/modules/sound/driver/Makefile	Tue Jul 13 12:47:31 2010	(r209991)
@@ -15,7 +15,7 @@ SUBDIR+=	audiocs
 .endif
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} == "powerpc"
 SUBDIR+=	ai2s davbus
 .endif