diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-07-17 13:34:01 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2010-07-17 13:34:01 +0000 |
| commit | f613d35061dd61535d3952c232cf25803198a13c (patch) | |
| tree | d0c784fd46da533e8ea097e6ee2757ac67f74558 /sys/modules | |
| parent | 5d6878ba3ae64d54ffc8ef13a26ba479d2f6f4a3 (diff) | |
| download | FreeBSD-src-f613d35061dd61535d3952c232cf25803198a13c.zip FreeBSD-src-f613d35061dd61535d3952c232cf25803198a13c.tar.gz | |
Add OpenSolaris atomics for powerpc64 and connect ZFS to the build on
this platform.
Reviewed by: pjd
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/Makefile | 9 | ||||
| -rw-r--r-- | sys/modules/opensolaris/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/zfs/Makefile | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 180bb10..ea0c748 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -624,6 +624,15 @@ _smbfs= smbfs _sound= sound .endif +.if ${MACHINE_ARCH} == "powerpc64" +.if ${MK_CDDL} != "no" || defined(ALL_MODULES) +_opensolaris= opensolaris +.endif +.if ${MK_ZFS} != "no" || defined(ALL_MODULES) +_zfs= zfs +.endif +.endif + .if ${MACHINE_ARCH} == "sparc64" _auxio= auxio _em= em diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile index a0f08fb..eef8ffd 100644 --- a/sys/modules/opensolaris/Makefile +++ b/sys/modules/opensolaris/Makefile @@ -8,7 +8,7 @@ SRCS= opensolaris.c \ opensolaris_kmem.c \ opensolaris_misc.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc64" .PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} SRCS+= opensolaris_atomic.S .else diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index edd492e..e4cf297 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -27,7 +27,7 @@ SRCS+= opensolaris_uio.c SRCS+= opensolaris_vfs.c SRCS+= opensolaris_zone.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc64" .PATH: ${SUNW}/common/atomic/${MACHINE_ARCH} SRCS+= opensolaris_atomic.S .else |
