Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

2008-12-19 16:11:14 -08:00 · 2008-12-19 16:11:14 -08:00 · 74e1502cb2
parent 7cb56dc1f8 449c6c9e8b
commit 74e1502cb2
3 changed files with 1 additions and 1 deletions
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@ -19,6 +19,6 @@ libspl_la_SOURCES = \
 	${top_srcdir}/lib/libspl/strnlen.c \
 	${top_srcdir}/lib/libspl/u8_textprep.c \
 	${top_srcdir}/lib/libspl/zone.c \
-	${top_srcdir}/lib/libspl/asm/atomic.S \
+	${top_srcdir}/lib/libspl/asm-${target_cpu}/atomic.S \
 	${top_srcdir}/lib/libspl/include/sys/list.h \
 	${top_srcdir}/lib/libspl/include/sys/list_impl.h
--- a/lib/libspl/asm-i686/atomic.S
+++ b/lib/libspl/asm-i686/atomic.S
--- a/lib/libspl/asm-x86_64/atomic.S
+++ b/lib/libspl/asm-x86_64/atomic.S