Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

This commit is contained in:
Brian Behlendorf 2009-06-08 16:32:08 -07:00
parent a033ac997b 33ac40573e
commit 6a5cd1f06e
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -3,6 +3,6 @@
aclocal -I config && aclocal -I config &&
libtoolize --automake --copy libtoolize --automake --copy
autoheader && autoheader &&
automake --add-missing --include-deps --copy 2>/dev/null automake --add-missing --include-deps --copy
autoconf autoconf
rm -rf autom4te.cache aclocal.m4 rm -rf autom4te.cache aclocal.m4

21
config/user-arch.m4 Normal file
View File

@ -0,0 +1,21 @@
dnl #
dnl # Set the target arch for libspl atomic implementation
dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER_ARCH], [
AC_MSG_CHECKING(for target arch)
TARGET_ARCH=`echo ${target_cpu} | sed -e s/i.86/i386/`
TARGET_ARCH_DIR=asm-$TARGET_ARCH
AC_MSG_RESULT([$TARGET_ARCH])
case $TARGET_ARCH in
i386|x86_64|powerpc)
AC_SUBST([TARGET_ARCH])
AC_SUBST([TARGET_ARCH_DIR])
;;
*)
AC_MSG_ERROR([
*** Unsupported architecture $TARGET_ARCH
*** Available architectures: x86, x86_64, powerpc])
;;
esac
])

1
config/user.m4
View File

@ -2,6 +2,7 @@ dnl #
dnl # Default ZFS user configuration dnl # Default ZFS user configuration
dnl # dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER], [ AC_DEFUN([ZFS_AC_CONFIG_USER], [
ZFS_AC_CONFIG_USER_ARCH
ZFS_AC_CONFIG_USER_LIBEFI ZFS_AC_CONFIG_USER_LIBEFI
ZFS_AC_CONFIG_USER_LIBDISKMGT ZFS_AC_CONFIG_USER_LIBDISKMGT
ZFS_AC_CONFIG_USER_LIBSHARE ZFS_AC_CONFIG_USER_LIBSHARE

7
lib/libspl/Makefile.am
View File

@ -1,7 +1,8 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
target_arch = $(shell echo ${target_cpu} | sed -e s/i.86/i386/) SUBDIRS = include $(TARGET_ARCH_DIR)
SUBDIRS = asm-i386 asm-x86_64 asm-powerpc64 include DIST_SUBDIRS = include asm-i386 asm-x86_64 asm-powerpc64
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include
@ -21,6 +22,6 @@ libspl_la_SOURCES = \
${top_srcdir}/lib/libspl/strnlen.c \ ${top_srcdir}/lib/libspl/strnlen.c \
${top_srcdir}/lib/libspl/zone.c \ ${top_srcdir}/lib/libspl/zone.c \
${top_srcdir}/lib/libspl/xdr.c \ ${top_srcdir}/lib/libspl/xdr.c \
${top_srcdir}/lib/libspl/asm-${target_arch}/atomic.S \ ${top_srcdir}/lib/libspl/${TARGET_ARCH_DIR}/atomic.S \
${top_srcdir}/lib/libspl/include/sys/list.h \ ${top_srcdir}/lib/libspl/include/sys/list.h \
${top_srcdir}/lib/libspl/include/sys/list_impl.h ${top_srcdir}/lib/libspl/include/sys/list_impl.h

4
lib/libspl/asm-powerpc64/Makefile.am
View File

@ -4,12 +4,12 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include -I${top_srcdir}/lib/libspl/include
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
atomic_SOURCES = atomic.c atomic_SOURCE = atomic.c
atomic_ASM = atomic.S atomic_ASM = atomic.S
# Generates assembly to simplify inclusion in ../Makefile.am # Generates assembly to simplify inclusion in ../Makefile.am
all-am: all-am:
$(COMPILE) -c -S ${atomic_SOURCES} -o ${atomic_ASM} $(COMPILE) -c -S ${atomic_SOURCE} -o ${atomic_ASM}
clean-generic: clean-generic:
rm ${atomic_ASM} rm ${atomic_ASM}