Module Name: src
Committed By: mrg
Date: Wed Jun 15 09:46:00 UTC 2011
Modified Files:
src: Makefile
src/share/mk: bsd.own.mk
src/sys: Makefile
src/sys/modules: Makefile
Added Files:
src/distrib/sets/lists/modules: md.evbppc
src/sys/modules/arch: Makefile archdirs.mk compatsubdir.mk
src/sys/modules/arch/dirshack: Makefile
src/sys/modules/arch/powerpc/powerpc-4xx: Makefile bsd.powerpc-4xx.mk
src/sys/modules/arch/powerpc/powerpc-booke: Makefile
bsd.powerpc-booke.mk
Log Message:
build evbppc modules in 3 different flavours:
- oea (default)
- ibm4xx
- booke
this, together with earlier machine_module[] work, should allow evbppc
platforms to use modules.
To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 src/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/modules/md.evbppc
cvs rdiff -u -r1.669 -r1.670 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.76 -r1.77 src/sys/Makefile
cvs rdiff -u -r1.72 -r1.73 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/arch/Makefile \
src/sys/modules/arch/archdirs.mk src/sys/modules/arch/compatsubdir.mk
cvs rdiff -u -r0 -r1.1 src/sys/modules/arch/dirshack/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/arch/powerpc/powerpc-4xx/Makefile \
src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk
cvs rdiff -u -r0 -r1.1 src/sys/modules/arch/powerpc/powerpc-booke/Makefile \
src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.282 src/Makefile:1.283
--- src/Makefile:1.282 Sat Jan 29 16:56:26 2011
+++ src/Makefile Wed Jun 15 09:45:58 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.282 2011/01/29 16:56:26 jym Exp $
+# $NetBSD: Makefile,v 1.283 2011/06/15 09:45:58 mrg Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -239,7 +239,7 @@
.endif
BUILDTARGETS+= do-lib-libc
BUILDTARGETS+= do-lib
-.if (${MACHINE} != "evbppc") && ${MKKMOD} != "no"
+.if ${MKKMOD} != "no"
BUILDTARGETS+= do-sys-modules
.endif
BUILDTARGETS+= do-sys-rump-dev-lib do-sys-rump-fs-lib
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.669 src/share/mk/bsd.own.mk:1.670
--- src/share/mk/bsd.own.mk:1.669 Fri May 27 17:06:54 2011
+++ src/share/mk/bsd.own.mk Wed Jun 15 09:45:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.669 2011/05/27 17:06:54 drochner Exp $
+# $NetBSD: bsd.own.mk,v 1.670 2011/06/15 09:45:59 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -725,6 +725,14 @@
MKCOMPAT:= no
.endif
+#.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" || \
+
+.if ${MACHINE} == "evbppc"
+MKCOMPATMODULES?= yes
+.else
+MKCOMPATMODULES:= no
+.endif
+
#
# Default mips64 to softfloat now.
# emips is always softfloat.
@@ -783,9 +791,9 @@
#
# Exceptions to the above:
#
-.if ${MACHINE} == "evbppc"
-MKKMOD= no
-.endif
+#.if ${MACHINE} == "evbppc"
+#MKKMOD= no
+#.endif
#
# MK* options which default to "no". Note that MKZFS has a different
Index: src/sys/Makefile
diff -u src/sys/Makefile:1.76 src/sys/Makefile:1.77
--- src/sys/Makefile:1.76 Sat Jun 26 14:24:27 2010
+++ src/sys/Makefile Wed Jun 15 09:45:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2010/06/26 14:24:27 kefren Exp $
+# $NetBSD: Makefile,v 1.77 2011/06/15 09:45:59 mrg Exp $
SUBDIR= altq arch compat dev fs miscfs \
net net80211 netatalk netbt netipsec netinet netinet6 \
@@ -6,11 +6,11 @@
nfs opencrypto sys ufs uvm
# interrupt implementation depends on the kernel within the port
-.if (${MACHINE} != "evbppc")
+#.if (${MACHINE} != "evbppc")
.if make(obj) || make(cleandir)
SUBDIR+=modules
.endif
-.endif
+#.endif
.if make(includes) || make(obj) || make(cleandir)
SUBDIR+= rump
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.72 src/sys/modules/Makefile:1.73
--- src/sys/modules/Makefile:1.72 Wed Jun 15 08:19:43 2011
+++ src/sys/modules/Makefile Wed Jun 15 09:45:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2011/06/15 08:19:43 jruoho Exp $
+# $NetBSD: Makefile,v 1.73 2011/06/15 09:45:59 mrg Exp $
.include <bsd.own.mk>
@@ -190,4 +190,8 @@
SUBDIR+= zfs
.endif
+.if (${MKCOMPATMODULES} != "no")
+SUBDIR+= arch
+.endif
+
.include <bsd.subdir.mk>
Added files:
Index: src/distrib/sets/lists/modules/md.evbppc
diff -u /dev/null src/distrib/sets/lists/modules/md.evbppc:1.1
--- /dev/null Wed Jun 15 09:46:00 2011
+++ src/distrib/sets/lists/modules/md.evbppc Wed Jun 15 09:45:59 2011
@@ -0,0 +1,283 @@
+# $NetBSD: md.evbppc,v 1.1 2011/06/15 09:45:59 mrg Exp $
+./stand/powerpc-4xx base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@ base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/accf_dataready base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/accf_dataready/accf_dataready.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/accf_httpready base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/accf_httpready/accf_httpready.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/adosfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/adosfs/adosfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/aio base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/aio/aio.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/bpf base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/bpf/bpf.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/cd9660 base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/cd9660/cd9660.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/coda base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/coda/coda.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/coda5 base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/coda5/coda5.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/compat base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/compat/compat.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/compat_ossaudio base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/coredump base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/coredump/coredump.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/dirhash base-obsolete obsolete
+./stand/powerpc-4xx/@OSRELEASE@/modules/dirhash/dirhash.kmod base-obsolete obsolete
+./stand/powerpc-4xx/@OSRELEASE@/modules/dm base-kernel-modules lvm,kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/dm/dm.kmod base-kernel-modules lvm,kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/dtrace base-kernel-modules kmod,dtrace
+./stand/powerpc-4xx/@OSRELEASE@/modules/dtrace/dtrace.kmod base-kernel-modules kmod,dtrace
+./stand/powerpc-4xx/@OSRELEASE@/modules/efs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/efs/efs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/exec_script base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/exec_script/exec_script.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/exec_elf32 base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ext2fs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ext2fs/ext2fs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/fbt base-kernel-modules kmod,dtrace
+./stand/powerpc-4xx/@OSRELEASE@/modules/fbt/fbt.kmod base-kernel-modules kmod,dtrace
+./stand/powerpc-4xx/@OSRELEASE@/modules/fdesc base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/fdesc/fdesc.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ffs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ffs/ffs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/filecore base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/filecore/filecore.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/flash base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/flash/flash.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/fss base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/fss/fss.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/hfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/kernfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/kernfs/kernfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ksem base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ksem/ksem.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/layerfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/layerfs/layerfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/lfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/lfs/lfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/mfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/mfs/mfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/miiverbose base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/miiverbose/miiverbose.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/miniroot base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/miniroot/miniroot.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/mqueue base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/mqueue/mqueue.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/msdos base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/msdos/msdos.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nand base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nand/nand.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nandemulator base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nandemulator/nandemulator.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nfs/nfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nfsserver base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nfsserver/nfsserver.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nilfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/nilfs/nilfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ntfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ntfs/ntfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/null base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/null/null.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/overlay base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/overlay/overlay.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/pciverbose base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/pciverbose/pciverbose.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/pf base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/pf/pf.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/portal base-obsolete obsolete
+./stand/powerpc-4xx/@OSRELEASE@/modules/portal/portal.kmod base-obsolete obsolete
+./stand/powerpc-4xx/@OSRELEASE@/modules/ppp_bsdcomp base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ppp_bsdcomp/ppp_bsdcomp.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ppp_deflate base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ppp_deflate/ppp_deflate.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/procfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/procfs/procfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ptyfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/ptyfs/ptyfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/puffs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/puffs/puffs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/putter base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/putter/putter.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/scsiverbose base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/scsiverbose/scsiverbose.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/sdt base-kernel-modules kmod,dtrace
+./stand/powerpc-4xx/@OSRELEASE@/modules/sdt/sdt.kmod base-kernel-modules kmod,dtrace
+./stand/powerpc-4xx/@OSRELEASE@/modules/secmodel_bsd44 base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/secmodel_bsd44/secmodel_bsd44.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/secmodel_overlay base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/secmodel_overlay/secmodel_overlay.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/securelevel base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/securelevel/securelevel.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/smbfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/smbfs/smbfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/solaris base-kernel-modules kmod,solaris
+./stand/powerpc-4xx/@OSRELEASE@/modules/solaris/solaris.kmod base-kernel-modules kmod,solaris
+./stand/powerpc-4xx/@OSRELEASE@/modules/suser base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/suser/suser.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/swsensor base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/swsensor/swsensor.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/sysvbfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/sysvbfs/sysvbfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/tmpfs base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/tmpfs/tmpfs.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/tprof base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/tprof/tprof.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/udf base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/udf/udf.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/umap base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/umap/umap.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/union base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/union/union.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/usbverbose base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/usbverbose/usbverbose.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/vnd base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/vnd/vnd.kmod base-kernel-modules kmod
+./stand/powerpc-4xx/@OSRELEASE@/modules/zfs base-kernel-modules kmod,zfs
+./stand/powerpc-4xx/@OSRELEASE@/modules/zfs/zfs.kmod base-kernel-modules kmod,zfs
+./stand/powerpc-booke base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@ base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/accf_dataready base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/accf_dataready/accf_dataready.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/accf_httpready base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/accf_httpready/accf_httpready.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/adosfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/adosfs/adosfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/aio base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/aio/aio.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/bpf base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/bpf/bpf.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/cd9660 base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/cd9660/cd9660.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/coda base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/coda/coda.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/coda5 base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/coda5/coda5.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/compat base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/compat/compat.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/compat_ossaudio base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/compat_ossaudio/compat_ossaudio.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/coredump base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/coredump/coredump.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/dirhash base-obsolete obsolete
+./stand/powerpc-booke/@OSRELEASE@/modules/dirhash/dirhash.kmod base-obsolete obsolete
+./stand/powerpc-booke/@OSRELEASE@/modules/dm base-kernel-modules lvm,kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/dm/dm.kmod base-kernel-modules lvm,kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/dtrace base-kernel-modules kmod,dtrace
+./stand/powerpc-booke/@OSRELEASE@/modules/dtrace/dtrace.kmod base-kernel-modules kmod,dtrace
+./stand/powerpc-booke/@OSRELEASE@/modules/efs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/efs/efs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/exec_script base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/exec_script/exec_script.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/exec_elf32 base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ext2fs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ext2fs/ext2fs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/fbt base-kernel-modules kmod,dtrace
+./stand/powerpc-booke/@OSRELEASE@/modules/fbt/fbt.kmod base-kernel-modules kmod,dtrace
+./stand/powerpc-booke/@OSRELEASE@/modules/fdesc base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/fdesc/fdesc.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ffs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ffs/ffs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/filecore base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/filecore/filecore.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/flash base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/flash/flash.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/fss base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/fss/fss.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/hfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/hfs/hfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/kernfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/kernfs/kernfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ksem base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ksem/ksem.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/layerfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/layerfs/layerfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/lfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/lfs/lfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/mfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/mfs/mfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/miiverbose base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/miiverbose/miiverbose.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/miniroot base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/miniroot/miniroot.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/mqueue base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/mqueue/mqueue.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/msdos base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/msdos/msdos.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nand base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nand/nand.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nandemulator base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nandemulator/nandemulator.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nfs/nfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nfsserver base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nfsserver/nfsserver.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nilfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/nilfs/nilfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ntfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ntfs/ntfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/null base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/null/null.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/overlay base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/overlay/overlay.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/pciverbose base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/pciverbose/pciverbose.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/pf base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/pf/pf.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/portal base-obsolete obsolete
+./stand/powerpc-booke/@OSRELEASE@/modules/portal/portal.kmod base-obsolete obsolete
+./stand/powerpc-booke/@OSRELEASE@/modules/ppp_bsdcomp base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ppp_bsdcomp/ppp_bsdcomp.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ppp_deflate base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ppp_deflate/ppp_deflate.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/procfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/procfs/procfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ptyfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/ptyfs/ptyfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/puffs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/puffs/puffs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/putter base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/putter/putter.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/scsiverbose base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/scsiverbose/scsiverbose.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/sdt base-kernel-modules kmod,dtrace
+./stand/powerpc-booke/@OSRELEASE@/modules/sdt/sdt.kmod base-kernel-modules kmod,dtrace
+./stand/powerpc-booke/@OSRELEASE@/modules/secmodel_bsd44 base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/secmodel_bsd44/secmodel_bsd44.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/secmodel_overlay base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/secmodel_overlay/secmodel_overlay.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/securelevel base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/securelevel/securelevel.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/smbfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/smbfs/smbfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/solaris base-kernel-modules kmod,solaris
+./stand/powerpc-booke/@OSRELEASE@/modules/solaris/solaris.kmod base-kernel-modules kmod,solaris
+./stand/powerpc-booke/@OSRELEASE@/modules/suser base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/suser/suser.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/swsensor base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/swsensor/swsensor.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/sysvbfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/sysvbfs/sysvbfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/tmpfs base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/tmpfs/tmpfs.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/tprof base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/tprof/tprof.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/udf base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/udf/udf.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/umap base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/umap/umap.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/union base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/union/union.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/usbverbose base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/usbverbose/usbverbose.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/vnd base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/vnd/vnd.kmod base-kernel-modules kmod
+./stand/powerpc-booke/@OSRELEASE@/modules/zfs base-kernel-modules kmod,zfs
+./stand/powerpc-booke/@OSRELEASE@/modules/zfs/zfs.kmod base-kernel-modules kmod,zfs
Index: src/sys/modules/arch/Makefile
diff -u /dev/null src/sys/modules/arch/Makefile:1.1
--- /dev/null Wed Jun 15 09:46:00 2011
+++ src/sys/modules/arch/Makefile Wed Jun 15 09:45:59 2011
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2011/06/15 09:45:59 mrg Exp $
+
+# Build multi-abi kernel modules
+
+.include <bsd.own.mk>
+
+.if ${MKCOMPATMODULES} != "no"
+.if !make(includes)
+
+.include "archdirs.mk"
+
+SUBDIR= dirshack .WAIT ${ARCHDIR_SUBDIR}
+
+.endif
+.endif
+
+.include <bsd.subdir.mk>
Index: src/sys/modules/arch/archdirs.mk
diff -u /dev/null src/sys/modules/arch/archdirs.mk:1.1
--- /dev/null Wed Jun 15 09:46:00 2011
+++ src/sys/modules/arch/archdirs.mk Wed Jun 15 09:45:59 2011
@@ -0,0 +1,12 @@
+# $NetBSD: archdirs.mk,v 1.1 2011/06/15 09:45:59 mrg Exp $
+
+# list of subdirs used per-platform
+
+.if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+# not yet
+#ARCHDIR_SUBDIR= x86/x86-xen
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+ARCHDIR_SUBDIR= powerpc/powerpc-4xx powerpc/powerpc-booke
+.endif
Index: src/sys/modules/arch/compatsubdir.mk
diff -u /dev/null src/sys/modules/arch/compatsubdir.mk:1.1
--- /dev/null Wed Jun 15 09:46:00 2011
+++ src/sys/modules/arch/compatsubdir.mk Wed Jun 15 09:45:59 2011
@@ -0,0 +1,30 @@
+# $NetBSD: compatsubdir.mk,v 1.1 2011/06/15 09:45:59 mrg Exp $
+
+# Build netbsd kernel modules.
+
+.include <bsd.own.mk>
+
+.if ${MKCOMPATMODULES} != "no"
+.if !make(includes)
+
+# make sure we get an objdir built early enough
+.include <bsd.prog.mk>
+
+MAKEDIRTARGETENV=
+.if defined(MAKEOBJDIRPREFIX)
+MAKEDIRTARGETENV+= unset MAKEOBJDIRPREFIX &&
+.endif
+MAKEDIRTARGETENV+= MAKEOBJDIR='$${.CURDIR:C,^${NETBSDSRCDIR},${.OBJDIR},}'
+MAKEDIRTARGETENV+= MKOBJDIRS=yes MKSHARE=no
+MAKEDIRTARGETENV+= BSD_MK_COMPAT_FILE=${BSD_MK_COMPAT_FILE} MKCOMPATMODULES=no
+
+.if defined(BOOTSTRAP_SUBDIRS)
+SUBDIR= ${BOOTSTRAP_SUBDIRS}
+.else
+SUBDIR= ../../../../modules
+.endif
+
+.include <bsd.subdir.mk>
+
+.endif
+.endif
Index: src/sys/modules/arch/dirshack/Makefile
diff -u /dev/null src/sys/modules/arch/dirshack/Makefile:1.1
--- /dev/null Wed Jun 15 09:46:00 2011
+++ src/sys/modules/arch/dirshack/Makefile Wed Jun 15 09:45:59 2011
@@ -0,0 +1,30 @@
+# $NetBSD: Makefile,v 1.1 2011/06/15 09:45:59 mrg Exp $
+
+# hacky method to get compat multilib base objdirs created before
+# make tries to go create the subdirs used for builds.
+
+# the problem is that make handles objdir creation for subdirs before it
+# handles this current directory, so when make cd's into $arch/$libtype
+# and from there into the ../../lib dirs, it ends up setting the forced
+# MAKEOBJDIR to something based upon ${.CURDIR}, since the objdir
+# doesn't exist yet.
+#
+# our solution is simple - from this Makefile we traverse the same list
+# of $arch/$libtype's with "BOOTSTRAP_SUBDIR=". then the compat/Makefile
+# handles these subdirs as normal, with the base objdir created.
+
+.include <bsd.own.mk>
+
+.if ${MKCOMPATMODULES} != "no"
+.if make(obj)
+
+.include "../archdirs.mk"
+
+MAKEDIRTARGETENV= BOOTSTRAP_SUBDIRS=
+
+SUBDIR= ${ARCHDIR_SUBDIR:C/^/..\//}
+
+.endif # make(obj)
+.endif # MKCOMPATMODULES != no
+
+.include <bsd.subdir.mk>
Index: src/sys/modules/arch/powerpc/powerpc-4xx/Makefile
diff -u /dev/null src/sys/modules/arch/powerpc/powerpc-4xx/Makefile:1.1
--- /dev/null Wed Jun 15 09:46:00 2011
+++ src/sys/modules/arch/powerpc/powerpc-4xx/Makefile Wed Jun 15 09:45:59 2011
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2011/06/15 09:45:59 mrg Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.powerpc-4xx.mk
+
+.include "../../compatsubdir.mk"
Index: src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk
diff -u /dev/null src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk:1.1
--- /dev/null Wed Jun 15 09:46:00 2011
+++ src/sys/modules/arch/powerpc/powerpc-4xx/bsd.powerpc-4xx.mk Wed Jun 15 09:45:59 2011
@@ -0,0 +1,17 @@
+# $NetBSD: bsd.powerpc-4xx.mk,v 1.1 2011/06/15 09:45:59 mrg Exp $
+
+.ifndef _BSD_POWERPC_4XX_MK_
+_BSD_POWERPC_4XX_MK_=1
+
+KMODULEARCHDIR:= powerpc-4xx
+
+CPPFLAGS+= -mcpu=403
+PPC_IBM4XX= 1
+
+# hack into bsd.kmodule.mk
+PPC_INTR_IMPL=\"powerpc/ibm4xx/ibm4xx_intr.h\"
+PPC_PCI_MACHDEP_IMPL=\"powerpc/ibm4xx/pci_machdep.h\"
+
+AFLAGS+= -mcpu=403
+
+.endif # _BSD_POWERPC_4XX_MK_
Index: src/sys/modules/arch/powerpc/powerpc-booke/Makefile
diff -u /dev/null src/sys/modules/arch/powerpc/powerpc-booke/Makefile:1.1
--- /dev/null Wed Jun 15 09:46:00 2011
+++ src/sys/modules/arch/powerpc/powerpc-booke/Makefile Wed Jun 15 09:45:59 2011
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2011/06/15 09:45:59 mrg Exp $
+
+BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.powerpc-booke.mk
+
+.include "../../compatsubdir.mk"
Index: src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk
diff -u /dev/null src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk:1.1
--- /dev/null Wed Jun 15 09:46:00 2011
+++ src/sys/modules/arch/powerpc/powerpc-booke/bsd.powerpc-booke.mk Wed Jun 15 09:45:59 2011
@@ -0,0 +1,19 @@
+# $NetBSD: bsd.powerpc-booke.mk,v 1.1 2011/06/15 09:45:59 mrg Exp $
+
+.ifndef _BSD_POWERPC_BOOKE_MK_
+_BSD_POWERPC_BOOKE_MK_=1
+
+KMODULEARCHDIR:= powerpc-booke
+
+# gcc emits bad code with these options
+#CPPFLAGS+= -mcpu=8548
+CPPFLAGS+= -mmultiple -mno-string -misel -Wa,-me500
+PPC_BOOKE= 1
+
+# hack into bsd.kmodule.mk
+PPC_INTR_IMPL=\"powerpc/booke/intr.h\"
+PPC_PCI_MACHDEP_IMPL=\"powerpc/pci_machdep.h\"
+
+AFLAGS+= -Wa,-me500
+
+.endif # _BSD_POWERPC_BOOKE_MK_
