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
 
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to