Module Name: src
Committed By: christos
Date: Tue Apr 22 15:02:38 UTC 2014
Modified Files:
src/external/cddl/osnet/lib/libzpool: Makefile atomic.c
Log Message:
Add fake atomic 64 ops for those who don't have them.
XXX: used to be arm, now it is also i386.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/cddl/osnet/lib/libzpool/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/lib/libzpool/atomic.c
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.8 src/external/cddl/osnet/lib/libzpool/Makefile:1.9
--- src/external/cddl/osnet/lib/libzpool/Makefile:1.8 Wed Sep 11 19:04:10 2013
+++ src/external/cddl/osnet/lib/libzpool/Makefile Tue Apr 22 11:02:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/09/11 23:04:10 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/04/22 15:02:38 christos Exp $
.include "${.CURDIR}/../../dist/uts/common/Makefile.files"
.include "../../Makefile.zfs"
@@ -21,10 +21,7 @@ CPPFLAGS+= -std=c99
#CPPFLAGS+=-Wall -Wno-unknown-pragmas
# Local stuff
-SRCS= kernel.c kernel2.c
-.if ${MACHINE_ARCH} == "arm"
-SRCS+= atomic.c
-.endif
+SRCS= kernel.c kernel2.c atomic.c
# Sun stuff
SRCS+= ${ZFS_COMMON_OBJS:C/.o$/.c/}
Index: src/external/cddl/osnet/lib/libzpool/atomic.c
diff -u src/external/cddl/osnet/lib/libzpool/atomic.c:1.1 src/external/cddl/osnet/lib/libzpool/atomic.c:1.2
--- src/external/cddl/osnet/lib/libzpool/atomic.c:1.1 Fri Jun 21 15:16:01 2013
+++ src/external/cddl/osnet/lib/libzpool/atomic.c Tue Apr 22 11:02:38 2014
@@ -1,7 +1,10 @@
#include <inttypes.h>
+#include <sys/types.h>
#include <sys/atomic.h>
+#ifndef __HAVE_ATOMIC64_OPS
+
/* XXX: Not so atomic, could use mutexes but not worth it */
uint64_t
atomic_cas_64(volatile uint64_t *ptr, uint64_t old, uint64_t new) {
@@ -30,3 +33,5 @@ uint64_t
atomic_add_64_nv(volatile uint64_t *ptr, int64_t delta) {
return *ptr += delta;
}
+
+#endif
