From caba3cb67e1e3e1c1fedf4c0abae340a18587d98 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Fri, 13 Mar 2009 09:41:55 -0700
Subject: [PATCH] Update specific asm-* arch to generic i386.
Depending on your x86 architecture $target_cpu can evaluate to
any of the following (i386|i486|i586|i686). Since our local asm
uses only i386 instructions sed is used to map all of these to
i386 and sets $target_arch. Other arch's are not impacted.
---
configure.ac | 2 +-
lib/libspl/Makefile.am | 5 +++--
lib/libspl/{asm-i686 => asm-i386}/Makefile.am | 0
lib/libspl/{asm-i686 => asm-i386}/atomic.S | 0
4 files changed, 4 insertions(+), 3 deletions(-)
rename lib/libspl/{asm-i686 => asm-i386}/Makefile.am (100%)
rename lib/libspl/{asm-i686 => asm-i386}/atomic.S (100%)
diff --git a/configure.ac b/configure.ac
index 00150216cb..85c7854726 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,7 +56,7 @@ AC_CONFIG_FILES([
doc/Makefile
lib/Makefile
lib/libspl/Makefile
- lib/libspl/asm-i686/Makefile
+ lib/libspl/asm-i386/Makefile
lib/libspl/asm-x86_64/Makefile
lib/libspl/include/Makefile
lib/libavl/Makefile
diff --git a/lib/libspl/Makefile.am b/lib/libspl/Makefile.am
index 5e84930b32..5788237e9b 100644
--- a/lib/libspl/Makefile.am
+++ b/lib/libspl/Makefile.am
@@ -1,6 +1,7 @@
include $(top_srcdir)/config/Rules.am
-SUBDIRS = asm-i686 asm-x86_64 include
+target_arch = $(shell echo ${target_cpu} | sed -e s/i.86/i386/)
+SUBDIRS = asm-i386 asm-x86_64 include
DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include
@@ -20,6 +21,6 @@ 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_cpu}/atomic.S \
+ ${top_srcdir}/lib/libspl/asm-${target_arch}/atomic.S \
${top_srcdir}/lib/libspl/include/sys/list.h \
${top_srcdir}/lib/libspl/include/sys/list_impl.h
diff --git a/lib/libspl/asm-i686/Makefile.am b/lib/libspl/asm-i386/Makefile.am
similarity index 100%
rename from lib/libspl/asm-i686/Makefile.am
rename to lib/libspl/asm-i386/Makefile.am
diff --git a/lib/libspl/asm-i686/atomic.S b/lib/libspl/asm-i386/atomic.S
similarity index 100%
rename from lib/libspl/asm-i686/atomic.S
rename to lib/libspl/asm-i386/atomic.S