From a393ae13a4fece7d10c86e81e543b7eb58bbb869 Mon Sep 17 00:00:00 2001
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 13 Jul 2010 12:47:31 +0000
Subject: [PATCH] Make kernel modules build correctly on 64-bit PowerPC.

---
 sys/modules/Makefile              | 4 ++--
 sys/modules/cas/Makefile          | 2 +-
 sys/modules/hwpmc/Makefile        | 2 +-
 sys/modules/sound/driver/Makefile | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 779924ef287d..180bb1064875 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -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
diff --git a/sys/modules/cas/Makefile b/sys/modules/cas/Makefile
index 8e71fcf7dc1f..0877c6c41084 100644
--- a/sys/modules/cas/Makefile
+++ b/sys/modules/cas/Makefile
@@ -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
 
diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile
index 1febf5489438..b295a67f5aeb 100644
--- a/sys/modules/hwpmc/Makefile
+++ b/sys/modules/hwpmc/Makefile
@@ -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
 
diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile
index f070119b8e43..c07a1c553376 100644
--- a/sys/modules/sound/driver/Makefile
+++ b/sys/modules/sound/driver/Makefile
@@ -15,7 +15,7 @@ SUBDIR+=	audiocs
 .endif
 .endif
 
-.if ${MACHINE_ARCH} == "powerpc"
+.if ${MACHINE_CPUARCH} == "powerpc"
 SUBDIR+=	ai2s davbus
 .endif