From 26f70525ee1234b4ae91a207ce4b5ddf84c322cc Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 8 Jun 2009 16:33:33 -0700 Subject: [PATCH] Refresh autogen products --- Makefile.in | 3 ++ cmd/Makefile.in | 3 ++ cmd/zdb/Makefile.in | 3 ++ cmd/zfs/Makefile.in | 3 ++ cmd/zinject/Makefile.in | 3 ++ cmd/zpios/Makefile.in | 3 ++ cmd/zpool/Makefile.in | 3 ++ cmd/ztest/Makefile.in | 3 ++ config/Makefile.in | 3 ++ configure | 52 +++++++++++++++++++++++++++- doc/Makefile.in | 3 ++ lib/Makefile.in | 3 ++ lib/libavl/Makefile.in | 3 ++ lib/libnvpair/Makefile.in | 3 ++ lib/libspl/Makefile.in | 14 ++++---- lib/libspl/asm-i386/Makefile.in | 3 ++ lib/libspl/asm-powerpc64/Makefile.in | 7 ++-- lib/libspl/asm-x86_64/Makefile.in | 3 ++ lib/libspl/include/Makefile.in | 3 ++ lib/libunicode/Makefile.in | 3 ++ lib/libuutil/Makefile.in | 3 ++ lib/libzfs/Makefile.in | 3 ++ lib/libzpool/Makefile.in | 3 ++ lib/libzpool/include/Makefile.in | 3 ++ scripts/Makefile.in | 3 ++ scripts/zpios-profile/Makefile.in | 3 ++ scripts/zpios-test/Makefile.in | 3 ++ scripts/zpool-config/Makefile.in | 3 ++ 28 files changed, 139 insertions(+), 9 deletions(-) diff --git a/Makefile.in b/Makefile.in index 292a7c048a..81c9e39970 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,6 +51,7 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -157,6 +158,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/cmd/Makefile.in b/cmd/Makefile.in index bedea24c06..b8237f5dce 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -41,6 +41,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -132,6 +133,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index 7864207cc5..bfdd66597a 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -44,6 +44,7 @@ subdir = cmd/zdb ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -150,6 +151,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index 4a2c5341ad..b0d7f55087 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -44,6 +44,7 @@ subdir = cmd/zfs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -150,6 +151,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index 0679bec608..14a0a0cdac 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -44,6 +44,7 @@ subdir = cmd/zinject ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -150,6 +151,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index 8cbf130e32..b3f8a1b36d 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -44,6 +44,7 @@ subdir = cmd/zpios ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -144,6 +145,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index 01aecc297c..80b6aecd7a 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -44,6 +44,7 @@ subdir = cmd/zpool ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -151,6 +152,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 2f3681bdd6..51138ff251 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -44,6 +44,7 @@ subdir = cmd/ztest ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -150,6 +151,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/config/Makefile.in b/config/Makefile.in index 4b8d697958..91e6db5322 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -42,6 +42,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in config.guess \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -124,6 +125,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/configure b/configure index 8a67128768..a47da60139 100755 --- a/configure +++ b/configure @@ -462,7 +462,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LINUX LINUX_OBJ LINUX_VERSION splsrc splsymvers LICENSE UNAME TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR ZFS_CONFIG KERNELMAKE_PARAMS KERNELCPPFLAGS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LINUX LINUX_OBJ LINUX_VERSION splsrc splsymvers LICENSE UNAME TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR ZFS_CONFIG KERNELMAKE_PARAMS KERNELCPPFLAGS TARGET_ARCH TARGET_ARCH_DIR LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -19287,6 +19287,30 @@ fi ;; user) + echo "$as_me:$LINENO: checking for target arch" >&5 +echo $ECHO_N "checking for target arch... $ECHO_C" >&6 + TARGET_ARCH=`echo ${target_cpu} | sed -e s/i.86/i386/` + TARGET_ARCH_DIR=asm-$TARGET_ARCH + echo "$as_me:$LINENO: result: $TARGET_ARCH" >&5 +echo "${ECHO_T}$TARGET_ARCH" >&6 + + case $TARGET_ARCH in + i386|x86_64|powerpc) + + + ;; + *) + { { echo "$as_me:$LINENO: error: + *** Unsupported architecture $TARGET_ARCH + *** Available architectures: x86, x86_64, powerpc" >&5 +echo "$as_me: error: + *** Unsupported architecture $TARGET_ARCH + *** Available architectures: x86, x86_64, powerpc" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + echo "$as_me:$LINENO: checking for efi_alloc_and_init in -lefi" >&5 echo $ECHO_N "checking for efi_alloc_and_init in -lefi... $ECHO_C" >&6 if test "${ac_cv_lib_efi_efi_alloc_and_init+set}" = set; then @@ -19689,6 +19713,30 @@ fi + echo "$as_me:$LINENO: checking for target arch" >&5 +echo $ECHO_N "checking for target arch... $ECHO_C" >&6 + TARGET_ARCH=`echo ${target_cpu} | sed -e s/i.86/i386/` + TARGET_ARCH_DIR=asm-$TARGET_ARCH + echo "$as_me:$LINENO: result: $TARGET_ARCH" >&5 +echo "${ECHO_T}$TARGET_ARCH" >&6 + + case $TARGET_ARCH in + i386|x86_64|powerpc) + + + ;; + *) + { { echo "$as_me:$LINENO: error: + *** Unsupported architecture $TARGET_ARCH + *** Available architectures: x86, x86_64, powerpc" >&5 +echo "$as_me: error: + *** Unsupported architecture $TARGET_ARCH + *** Available architectures: x86, x86_64, powerpc" >&2;} + { (exit 1); exit 1; }; } + ;; + esac + + echo "$as_me:$LINENO: checking for efi_alloc_and_init in -lefi" >&5 echo $ECHO_N "checking for efi_alloc_and_init in -lefi... $ECHO_C" >&6 if test "${ac_cv_lib_efi_efi_alloc_and_init+set}" = set; then @@ -20854,6 +20902,8 @@ s,@MODDIR@,$MODDIR,;t t s,@ZFS_CONFIG@,$ZFS_CONFIG,;t t s,@KERNELMAKE_PARAMS@,$KERNELMAKE_PARAMS,;t t s,@KERNELCPPFLAGS@,$KERNELCPPFLAGS,;t t +s,@TARGET_ARCH@,$TARGET_ARCH,;t t +s,@TARGET_ARCH_DIR@,$TARGET_ARCH_DIR,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/doc/Makefile.in b/doc/Makefile.in index 2a166cfa7e..e103817665 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -41,6 +41,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -123,6 +124,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/Makefile.in b/lib/Makefile.in index f885cdc271..c18ec1106e 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -41,6 +41,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -132,6 +133,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index fc069c634a..e5e814c098 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -43,6 +43,7 @@ subdir = lib/libavl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -149,6 +150,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index bc7f7b75da..9b01344be0 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -43,6 +43,7 @@ subdir = lib/libnvpair ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -150,6 +151,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index c97d6b97bd..83446073ea 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -43,6 +43,7 @@ subdir = lib/libspl ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -91,7 +92,6 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ uninstall-recursive ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ @@ -161,6 +161,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ @@ -232,8 +234,8 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \ -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \ -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" -target_arch = $(shell echo ${target_cpu} | sed -e s/i.86/i386/) -SUBDIRS = asm-i386 asm-x86_64 asm-powerpc64 include +SUBDIRS = include $(TARGET_ARCH_DIR) +DIST_SUBDIRS = include asm-i386 asm-x86_64 asm-powerpc64 AM_CCASFLAGS = \ -I${top_srcdir}/lib/libspl/include @@ -249,7 +251,7 @@ libspl_la_SOURCES = \ ${top_srcdir}/lib/libspl/strnlen.c \ ${top_srcdir}/lib/libspl/zone.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_impl.h @@ -342,8 +344,8 @@ distclean-compile: .S.lo: $(LTCCASCOMPILE) -c -o $@ $< -atomic.lo: ${top_srcdir}/lib/libspl/asm-${target_arch}/atomic.S - $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o atomic.lo `test -f '${top_srcdir}/lib/libspl/asm-${target_arch}/atomic.S' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/asm-${target_arch}/atomic.S +atomic.lo: ${top_srcdir}/lib/libspl/${TARGET_ARCH_DIR}/atomic.S + $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o atomic.lo `test -f '${top_srcdir}/lib/libspl/${TARGET_ARCH_DIR}/atomic.S' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/${TARGET_ARCH_DIR}/atomic.S .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in index d4cafff09d..b403d473bf 100644 --- a/lib/libspl/asm-i386/Makefile.in +++ b/lib/libspl/asm-i386/Makefile.in @@ -43,6 +43,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -128,6 +129,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libspl/asm-powerpc64/Makefile.in b/lib/libspl/asm-powerpc64/Makefile.in index 4e5ba15a2d..1abbcc8f90 100644 --- a/lib/libspl/asm-powerpc64/Makefile.in +++ b/lib/libspl/asm-powerpc64/Makefile.in @@ -42,6 +42,7 @@ subdir = lib/libspl/asm-powerpc64 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -124,6 +125,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ @@ -198,7 +201,7 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror \ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -atomic_SOURCES = atomic.c +atomic_SOURCE = atomic.c atomic_ASM = atomic.S all: all-am @@ -362,7 +365,7 @@ uninstall-am: uninstall-info-am # Generates assembly to simplify inclusion in ../Makefile.am all-am: - $(COMPILE) -c -S ${atomic_SOURCES} -o ${atomic_ASM} + $(COMPILE) -c -S ${atomic_SOURCE} -o ${atomic_ASM} clean-generic: rm ${atomic_ASM} diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in index 9cbb9aa7fd..db0cc6a2a1 100644 --- a/lib/libspl/asm-x86_64/Makefile.in +++ b/lib/libspl/asm-x86_64/Makefile.in @@ -43,6 +43,7 @@ DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -128,6 +129,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in index 3e1f01d31d..3fc1f372c2 100644 --- a/lib/libspl/include/Makefile.in +++ b/lib/libspl/include/Makefile.in @@ -43,6 +43,7 @@ DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -136,6 +137,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index 939e0790b8..c5878327ab 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -43,6 +43,7 @@ subdir = lib/libunicode ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -149,6 +150,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index 0dc907287e..5e5ce4dc16 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -43,6 +43,7 @@ subdir = lib/libuutil ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -151,6 +152,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index e94f88be2e..00fde64958 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -43,6 +43,7 @@ subdir = lib/libzfs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -152,6 +153,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index cc7cbfccdd..11d347836b 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -43,6 +43,7 @@ subdir = lib/libzpool ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -169,6 +170,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/lib/libzpool/include/Makefile.in b/lib/libzpool/include/Makefile.in index ffa68db3ea..4cdc5dbb1d 100644 --- a/lib/libzpool/include/Makefile.in +++ b/lib/libzpool/include/Makefile.in @@ -43,6 +43,7 @@ DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -136,6 +137,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 98fcb39b50..dde017b324 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -41,6 +41,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -132,6 +133,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in index fa63ba0f34..45abf43e83 100644 --- a/scripts/zpios-profile/Makefile.in +++ b/scripts/zpios-profile/Makefile.in @@ -41,6 +41,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -123,6 +124,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in index d504a8315a..39ec01493a 100644 --- a/scripts/zpios-test/Makefile.in +++ b/scripts/zpios-test/Makefile.in @@ -41,6 +41,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -123,6 +124,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in index de5bf89e5f..fa94a97ada 100644 --- a/scripts/zpool-config/Makefile.in +++ b/scripts/zpool-config/Makefile.in @@ -41,6 +41,7 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/kernel-bio-args.m4 \ $(top_srcdir)/config/kernel.m4 \ + $(top_srcdir)/config/user-arch.m4 \ $(top_srcdir)/config/user-ioctl.m4 \ $(top_srcdir)/config/user-libdiskmgt.m4 \ $(top_srcdir)/config/user-libefi.m4 \ @@ -123,6 +124,8 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +TARGET_ARCH = @TARGET_ARCH@ +TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@