From 9eba2904d11ed785ef1cc694b8615aeb353c2252 Mon Sep 17 00:00:00 2001 From: pjd Date: Fri, 8 Jun 2007 12:35:47 +0000 Subject: - 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. --- cddl/lib/libzpool/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cddl/lib/libzpool') diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 28e09b9..f086b6d 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} -- cgit v1.1