aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
authorPawel Jakub Dawidek <pjd@FreeBSD.org>2007-06-08 12:35:47 +0000
committerPawel Jakub Dawidek <pjd@FreeBSD.org>2007-06-08 12:35:47 +0000
commit3b7917d766761f79841645281a679eb3d7f79898 (patch)
treec13033e14290bd6f5979ef75215789df0fb2f0d4 /cddl
parent083c4dd695fd0ec5c7275a7da68f260ce0d589be (diff)
downloadsrc-3b7917d766761f79841645281a679eb3d7f79898.tar.gz
src-3b7917d766761f79841645281a679eb3d7f79898.zip
- Reduce number of atomic operations needed to be implemented in asm by
implementing some of them using existing ones. - Allow to compile ZFS on all archs and use atomic operations surrounded by global mutex on archs we don't have or can't have all atomic operations needed by ZFS.
Notes
Notes: svn path=/head/; revision=170431
Diffstat (limited to 'cddl')
-rw-r--r--cddl/lib/Makefile2
-rw-r--r--cddl/lib/libzpool/Makefile7
-rw-r--r--cddl/usr.bin/Makefile2
-rw-r--r--cddl/usr.sbin/Makefile2
4 files changed, 6 insertions, 7 deletions
diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile
index 4ee478016a1d..94a93a13ea87 100644
--- a/cddl/lib/Makefile
+++ b/cddl/lib/Makefile
@@ -11,9 +11,7 @@ SUBDIR= libavl \
.if ${MK_ZFS} != "no"
_libzfs= libzfs
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
_libzpool= libzpool
.endif
-.endif
.include <bsd.subdir.mk>
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 28e09b9f78e1..f086b6d02b1d 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -11,7 +11,13 @@
# LIST_SRCS
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os
# ATOMIC_SRCS
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+ATOMIC_SRCS= atomic.S
+.else
+.PATH: ${.CURDIR}/../../../sys/compat/opensolaris/kern
+ATOMIC_SRCS= opensolaris_atomic.c
+.endif
LIB= zpool
@@ -19,7 +25,6 @@ ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c
ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/}
KERNEL_SRCS= kernel.c taskq.c util.c
LIST_SRCS= list.c
-ATOMIC_SRCS= atomic.S
SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \
${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS}
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 0a9035a022c9..95e5ac498784 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -5,9 +5,7 @@
SUBDIR= ${_ztest}
.if ${MK_ZFS} != "no"
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
_ztest= ztest
.endif
-.endif
.include <bsd.subdir.mk>
diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile
index 65756fbf0eea..1be350108b44 100644
--- a/cddl/usr.sbin/Makefile
+++ b/cddl/usr.sbin/Makefile
@@ -5,9 +5,7 @@
SUBDIR= ${_zdb}
.if ${MK_ZFS} != "no"
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
_zdb= zdb
.endif
-.endif
.include <bsd.subdir.mk>