Module Name: src
Committed By: haad
Date: Tue Dec 14 23:39:11 UTC 2010
Modified Files:
src/external/cddl/osnet/lib/libzpool: Makefile
Log Message:
Do not built 64b atomic ops to libzpool they are in libc again.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/cddl/osnet/lib/libzpool/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libzpool/Makefile
diff -u src/external/cddl/osnet/lib/libzpool/Makefile:1.5 src/external/cddl/osnet/lib/libzpool/Makefile:1.6
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.5 Tue Dec 14 09:19:14 2010
+++ src/external/cddl/osnet/lib/libzpool/Makefile Tue Dec 14 23:39:11 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/14 09:19:14 haad Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/14 23:39:11 haad Exp $
.include "${.CURDIR}/../../dist/uts/common/Makefile.files"
.include "../../Makefile.zfs"
@@ -23,13 +23,6 @@
SRCS+= ${ZFS_SHARED_OBJS:C/.o$/.c/}
SRCS+= taskq.c util.c list.o u8_textprep.o
-# Add opensolaris atomic functions and use fakedones if we do not support them
-.if ${MACHINE_ARCH} == "i386"
-CPPFLAGS+= -D__HAVE_ATOMIC64_OPS # add NetBSD 64 add operations on i386
-.PATH: ${NETBSDSRCDIR}/common/lib/libc/atomic
-SRCS+= atomic_add_64_cas.c atomic_add_64_nv_cas.c atomic_inc_64_cas.c atomic_dec_64_cas.c
-.endif
-
print:
echo ${LIST_SRCS} ${LIST_OBJS}
