From f5d944f935ad969245eeda35f97c3afdbcc29c18 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 18 May 2010 12:25:15 -0700
Subject: [PATCH] Move user-arch.m4 change from linux-libspl to zfs-branch.

---
 config/user-arch.m4 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/config/user-arch.m4 b/config/user-arch.m4
index fcc566fc5d..1ffa28b0eb 100644
--- a/config/user-arch.m4
+++ b/config/user-arch.m4
@@ -2,18 +2,20 @@ dnl #
 dnl # Set the target arch for libspl atomic implementation
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_USER_ARCH], [
-	AC_MSG_CHECKING(for target asm dir)
+	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)
-		TARGET_ASM_DIR=asm-${TARGET_ARCH}
+	i386|x86_64|powerpc64)
+		AC_SUBST([TARGET_ARCH])
+		AC_SUBST([TARGET_ARCH_DIR])
 		;;
 	*)
-		TARGET_ASM_DIR=asm-generic
+                AC_MSG_ERROR([
+		*** Unsupported architecture $TARGET_ARCH
+		*** Available architectures: x86, x86_64, powerpc64])
 		;;
 	esac
-
-	AC_SUBST([TARGET_ASM_DIR])
-	AC_MSG_RESULT([$TARGET_ASM_DIR])
 ])