diff options
| author | kmacy <kmacy@FreeBSD.org> | 2009-05-09 05:39:35 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2009-05-09 05:39:35 +0000 |
| commit | 78c3549a9f520aeaee0aad13d7da31d0b99d2209 (patch) | |
| tree | 9c096f3731044d84c7d412787012592533c2be0d /cddl | |
| parent | 3ec7a2297d93a143bb10515bb61abba358e3f3d7 (diff) | |
| download | FreeBSD-src-78c3549a9f520aeaee0aad13d7da31d0b99d2209.zip FreeBSD-src-78c3549a9f520aeaee0aad13d7da31d0b99d2209.tar.gz | |
atomic.S has been renamed opensolaris_atomic.S to avoid collisions
Diffstat (limited to 'cddl')
| -rw-r--r-- | cddl/lib/libzpool/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 54ab6c0..fec99d9 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -13,7 +13,7 @@ # ATOMIC_SRCS .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} -ATOMIC_SRCS= atomic.S +ATOMIC_SRCS= opensolaris_atomic.S .else .PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c |
