From 8feebe7d65fabbe50b7d181a44618e9e2be97376 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 16 Jul 2009 10:29:59 -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 | 57 ++--- doc/Makefile.in | 3 +- lib/Makefile.in | 3 +- lib/libavl/Makefile.in | 3 +- lib/libnvpair/Makefile.in | 3 +- lib/libspl/Makefile.in | 13 +- lib/libspl/asm-generic/Makefile.in | 381 +++++++++++++++++++++++++++++ lib/libspl/asm-i386/Makefile.in | 3 +- 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, 434 insertions(+), 92 deletions(-) create mode 100644 lib/libspl/asm-generic/Makefile.in diff --git a/Makefile.in b/Makefile.in index 1190cbed2f..75d9103e27 100644 --- a/Makefile.in +++ b/Makefile.in @@ -171,8 +171,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/cmd/Makefile.in b/cmd/Makefile.in index 4a2f47a9a3..3e2cb22356 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -143,8 +143,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index 884fcfa25e..16dbdafcce 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -161,8 +161,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index e3e49f510b..438e0d0dfc 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -161,8 +161,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index 435e723014..c1f8f822df 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -161,8 +161,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index 2ba1311d2b..a559ad191b 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -155,8 +155,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index 151d8c7579..abb35dd47c 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -162,8 +162,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 00a2896cfe..c9d0dbc16b 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -161,8 +161,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/config/Makefile.in b/config/Makefile.in index 20c7b9ef26..cad9212737 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -135,8 +135,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/configure b/configure index 055d16a170..dc2767f953 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 LICENSE TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR ZFS_CONFIG LINUX LINUX_OBJ LINUX_VERSION LINUX_SYMBOLS SPL SPL_OBJ SPL_VERSION SPL_SYMBOLS KERNELMAKE_PARAMS KERNELCPPFLAGS TARGET_ARCH TARGET_ARCH_DIR CONFIG_USER_TRUE CONFIG_USER_FALSE CONFIG_KERNEL_TRUE CONFIG_KERNEL_FALSE 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 LICENSE TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR ZFS_CONFIG LINUX LINUX_OBJ LINUX_VERSION LINUX_SYMBOLS SPL SPL_OBJ SPL_VERSION SPL_SYMBOLS KERNELMAKE_PARAMS KERNELCPPFLAGS TARGET_ASM_DIR CONFIG_USER_TRUE CONFIG_USER_FALSE CONFIG_KERNEL_TRUE CONFIG_KERNEL_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -19298,30 +19298,24 @@ fi ;; user) - echo "$as_me:$LINENO: checking for target arch" >&5 -echo $ECHO_N "checking for target arch... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for target asm dir" >&5 +echo $ECHO_N "checking for target asm dir... $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|powerpc64) - - + i386|x86_64) + TARGET_ASM_DIR=asm-${TARGET_ARCH} ;; *) - { { echo "$as_me:$LINENO: error: - *** Unsupported architecture $TARGET_ARCH - *** Available architectures: x86, x86_64, powerpc64" >&5 -echo "$as_me: error: - *** Unsupported architecture $TARGET_ARCH - *** Available architectures: x86, x86_64, powerpc64" >&2;} - { (exit 1); exit 1; }; } + TARGET_ASM_DIR=asm-generic ;; esac + echo "$as_me:$LINENO: result: $TARGET_ASM_DIR" >&5 +echo "${ECHO_T}$TARGET_ASM_DIR" >&6 + + 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 @@ -20256,30 +20250,24 @@ fi - echo "$as_me:$LINENO: checking for target arch" >&5 -echo $ECHO_N "checking for target arch... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for target asm dir" >&5 +echo $ECHO_N "checking for target asm dir... $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|powerpc64) - - + i386|x86_64) + TARGET_ASM_DIR=asm-${TARGET_ARCH} ;; *) - { { echo "$as_me:$LINENO: error: - *** Unsupported architecture $TARGET_ARCH - *** Available architectures: x86, x86_64, powerpc64" >&5 -echo "$as_me: error: - *** Unsupported architecture $TARGET_ARCH - *** Available architectures: x86, x86_64, powerpc64" >&2;} - { (exit 1); exit 1; }; } + TARGET_ASM_DIR=asm-generic ;; esac + echo "$as_me:$LINENO: result: $TARGET_ASM_DIR" >&5 +echo "${ECHO_T}$TARGET_ASM_DIR" >&6 + + 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 @@ -20991,7 +20979,7 @@ _ACEOF fi - ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/asm-powerpc64/Makefile lib/libspl/include/Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzpool/include/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile scripts/Makefile scripts/zpool-config/Makefile scripts/zpios-test/Makefile scripts/zpios-profile/Makefile zfs.spec zfs-modules.spec" + ac_config_files="$ac_config_files Makefile config/Makefile doc/Makefile lib/Makefile lib/libspl/Makefile lib/libspl/asm-generic/Makefile lib/libspl/asm-i386/Makefile lib/libspl/asm-x86_64/Makefile lib/libspl/include/Makefile lib/libavl/Makefile lib/libnvpair/Makefile lib/libunicode/Makefile lib/libuutil/Makefile lib/libzpool/Makefile lib/libzpool/include/Makefile lib/libzfs/Makefile cmd/Makefile cmd/zdb/Makefile cmd/zfs/Makefile cmd/zinject/Makefile cmd/zpool/Makefile cmd/ztest/Makefile cmd/zpios/Makefile module/Makefile module/avl/Makefile module/nvpair/Makefile module/unicode/Makefile module/zcommon/Makefile module/zfs/Makefile module/zpios/Makefile scripts/Makefile scripts/zpool-config/Makefile scripts/zpios-test/Makefile scripts/zpios-profile/Makefile zfs.spec zfs-modules.spec" cat >confcache <<\_ACEOF @@ -21576,9 +21564,9 @@ do "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/libspl/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libspl/Makefile" ;; + "lib/libspl/asm-generic/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libspl/asm-generic/Makefile" ;; "lib/libspl/asm-i386/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libspl/asm-i386/Makefile" ;; "lib/libspl/asm-x86_64/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libspl/asm-x86_64/Makefile" ;; - "lib/libspl/asm-powerpc64/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libspl/asm-powerpc64/Makefile" ;; "lib/libspl/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libspl/include/Makefile" ;; "lib/libavl/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libavl/Makefile" ;; "lib/libnvpair/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/libnvpair/Makefile" ;; @@ -21795,8 +21783,7 @@ s,@SPL_VERSION@,$SPL_VERSION,;t t s,@SPL_SYMBOLS@,$SPL_SYMBOLS,;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,@TARGET_ASM_DIR@,$TARGET_ASM_DIR,;t t s,@CONFIG_USER_TRUE@,$CONFIG_USER_TRUE,;t t s,@CONFIG_USER_FALSE@,$CONFIG_USER_FALSE,;t t s,@CONFIG_KERNEL_TRUE@,$CONFIG_KERNEL_TRUE,;t t diff --git a/doc/Makefile.in b/doc/Makefile.in index 8d885990c6..bfe7829858 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -134,8 +134,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/Makefile.in b/lib/Makefile.in index 74576cb10f..a9e7fc7c21 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -143,8 +143,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index 8fc8694490..1b29873864 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -160,8 +160,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 9d74b79d6c..a61979fb0c 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -161,8 +161,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index 5f5591592c..6a4fa5251a 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -171,8 +171,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ @@ -241,8 +240,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\" -SUBDIRS = include $(TARGET_ARCH_DIR) -DIST_SUBDIRS = include asm-i386 asm-x86_64 asm-powerpc64 +SUBDIRS = include $(TARGET_ASM_DIR) +DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64 AM_CCASFLAGS = \ -I${top_srcdir}/lib/libspl/include @@ -258,7 +257,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/${TARGET_ARCH_DIR}/atomic.S \ + ${top_srcdir}/lib/libspl/${TARGET_ASM_DIR}/atomic.S \ ${top_srcdir}/lib/libspl/include/sys/list.h \ ${top_srcdir}/lib/libspl/include/sys/list_impl.h @@ -351,8 +350,8 @@ distclean-compile: .S.lo: $(LTCCASCOMPILE) -c -o $@ $< -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 +atomic.lo: ${top_srcdir}/lib/libspl/${TARGET_ASM_DIR}/atomic.S + $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o atomic.lo `test -f '${top_srcdir}/lib/libspl/${TARGET_ASM_DIR}/atomic.S' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/${TARGET_ASM_DIR}/atomic.S .c.o: @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ diff --git a/lib/libspl/asm-generic/Makefile.in b/lib/libspl/asm-generic/Makefile.in new file mode 100644 index 0000000000..2a910dd22a --- /dev/null +++ b/lib/libspl/asm-generic/Makefile.in @@ -0,0 +1,381 @@ +# Makefile.in generated by automake 1.9.6 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/config/Rules.am +subdir = lib/libspl/asm-generic +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 \ + $(top_srcdir)/config/user-libshare.m4 \ + $(top_srcdir)/config/user-zlib.m4 $(top_srcdir)/config/user.m4 \ + $(top_srcdir)/config/zfs-build.m4 \ + $(top_srcdir)/config/zfs-meta.m4 $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/zfs_config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BUILDDIR = @BUILDDIR@ +CC = @CC@ +CCAS = @CCAS@ +CCASFLAGS = @CCASFLAGS@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CMDDIR = @CMDDIR@ +CONFIG_KERNEL_FALSE = @CONFIG_KERNEL_FALSE@ +CONFIG_KERNEL_TRUE = @CONFIG_KERNEL_TRUE@ +CONFIG_USER_FALSE = @CONFIG_USER_FALSE@ +CONFIG_USER_TRUE = @CONFIG_USER_TRUE@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNELCPPFLAGS = @KERNELCPPFLAGS@ +KERNELMAKE_PARAMS = @KERNELMAKE_PARAMS@ +LDFLAGS = @LDFLAGS@ +LIBDIR = @LIBDIR@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LICENSE = @LICENSE@ +LINUX = @LINUX@ +LINUX_OBJ = @LINUX_OBJ@ +LINUX_SYMBOLS = @LINUX_SYMBOLS@ +LINUX_VERSION = @LINUX_VERSION@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MAINT = @MAINT@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ +OBJEXT = @OBJEXT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SPL = @SPL@ +SPL_OBJ = @SPL_OBJ@ +SPL_SYMBOLS = @SPL_SYMBOLS@ +SPL_VERSION = @SPL_VERSION@ +STRIP = @STRIP@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ +TOPDIR = @TOPDIR@ +VERSION = @VERSION@ +ZFS_CONFIG = @ZFS_CONFIG@ +ZFS_META_ALIAS = @ZFS_META_ALIAS@ +ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ +ZFS_META_DATA = @ZFS_META_DATA@ +ZFS_META_LT_AGE = @ZFS_META_LT_AGE@ +ZFS_META_LT_CURRENT = @ZFS_META_LT_CURRENT@ +ZFS_META_LT_REVISION = @ZFS_META_LT_REVISION@ +ZFS_META_NAME = @ZFS_META_NAME@ +ZFS_META_RELEASE = @ZFS_META_RELEASE@ +ZFS_META_VERSION = @ZFS_META_VERSION@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ +DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include + +# FIXME: Add -Wshadow once everything is working + +# Expected defines not covered by zfs_config.h or spl_config.h +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\" +atomic_SOURCE = atomic.c +atomic_ASM = atomic.S +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + +EXTRA_DIST = ${atomic_SOURCE} +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/Rules.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu lib/libspl/asm-generic/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu lib/libspl/asm-generic/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/../../../config + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-libtool + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + distclean distclean-generic distclean-libtool distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-exec install-exec-am \ + install-info install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am + + +# Generates assembly to simplify inclusion in ../Makefile.am +all-am: + $(COMPILE) -c -S ${atomic_SOURCE} -o ${atomic_ASM} + +clean-generic: + $(RM) ${atomic_ASM} +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/lib/libspl/asm-i386/Makefile.in b/lib/libspl/asm-i386/Makefile.in index 6205cc58ce..013245f761 100644 --- a/lib/libspl/asm-i386/Makefile.in +++ b/lib/libspl/asm-i386/Makefile.in @@ -139,8 +139,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libspl/asm-x86_64/Makefile.in b/lib/libspl/asm-x86_64/Makefile.in index b669f902e7..22069a659a 100644 --- a/lib/libspl/asm-x86_64/Makefile.in +++ b/lib/libspl/asm-x86_64/Makefile.in @@ -139,8 +139,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libspl/include/Makefile.in b/lib/libspl/include/Makefile.in index 6040e4d2a2..f696fe9bba 100644 --- a/lib/libspl/include/Makefile.in +++ b/lib/libspl/include/Makefile.in @@ -147,8 +147,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in index db5ffb6d8c..6814203cc3 100644 --- a/lib/libunicode/Makefile.in +++ b/lib/libunicode/Makefile.in @@ -160,8 +160,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index e8a23b7002..85f2feec4b 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -162,8 +162,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index dd241145c9..9280cd0108 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -163,8 +163,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 58708aee67..3ff1117db0 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -180,8 +180,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/lib/libzpool/include/Makefile.in b/lib/libzpool/include/Makefile.in index aae76fc5c5..4906e57544 100644 --- a/lib/libzpool/include/Makefile.in +++ b/lib/libzpool/include/Makefile.in @@ -147,8 +147,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 32429b87fd..a6ab49ef3d 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -143,8 +143,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/scripts/zpios-profile/Makefile.in b/scripts/zpios-profile/Makefile.in index d7b6af7c2f..4e14d4544f 100644 --- a/scripts/zpios-profile/Makefile.in +++ b/scripts/zpios-profile/Makefile.in @@ -134,8 +134,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/scripts/zpios-test/Makefile.in b/scripts/zpios-test/Makefile.in index 3d80ea913a..b76239cef9 100644 --- a/scripts/zpios-test/Makefile.in +++ b/scripts/zpios-test/Makefile.in @@ -134,8 +134,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@ diff --git a/scripts/zpool-config/Makefile.in b/scripts/zpool-config/Makefile.in index a82cf63c6b..221e0a7836 100644 --- a/scripts/zpool-config/Makefile.in +++ b/scripts/zpool-config/Makefile.in @@ -134,8 +134,7 @@ SPL_OBJ = @SPL_OBJ@ SPL_SYMBOLS = @SPL_SYMBOLS@ SPL_VERSION = @SPL_VERSION@ STRIP = @STRIP@ -TARGET_ARCH = @TARGET_ARCH@ -TARGET_ARCH_DIR = @TARGET_ARCH_DIR@ +TARGET_ASM_DIR = @TARGET_ASM_DIR@ TOPDIR = @TOPDIR@ VERSION = @VERSION@ ZFS_CONFIG = @ZFS_CONFIG@