summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schleef <ds@schleef.org>2005-10-17 17:24:01 +0000
committerDavid Schleef <ds@schleef.org>2005-10-17 17:24:01 +0000
commit7e367e271f83a0ca391b0c3268070addfafdb805 (patch)
tree6ea8cf7d7f23596d341ca86dfa5fe34151616541
parent662216678ddda92b48506618688b533d5a4e5a23 (diff)
downloadliboil-7e367e271f83a0ca391b0c3268070addfafdb805.tar.gz
* configure.ac: Check for -masm-blocks before using the feature
* liboil/powerpc/Makefile.am:
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac7
-rw-r--r--liboil/powerpc/Makefile.am17
3 files changed, 22 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 5a79c48..1a98636 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-17 David Schleef <ds@schleef.org>
+
+ * configure.ac: Check for -masm-blocks before using the feature
+ * liboil/powerpc/Makefile.am:
+
2005-10-10 David Schleef <ds@schleef.org>
* liboil/powerpc/clip.c: Move more files around
diff --git a/configure.ac b/configure.ac
index 0a0651b..cf03902 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,6 +145,13 @@ if test x$HAVE_CPU_POWERPC = xyes ; then
true)
fi
+AS_COMPILER_FLAG(["-fasm-blocks"], HAVE_ASM_BLOCKS=yes, HAVE_ASM_BLOCKS=no)
+if test "x$HAVE_ASM_BLOCKS" = "xyes"
+then
+ LIBOIL_CFLAGS="$LIBOIL_CFLAGS -fasm-blocks"
+fi
+AM_CONDITIONAL(HAVE_ASM_BLOCKS, test "x$HAVE_ASM_BLOCKS" = "xyes")
+
if test x$HAVE_CPU_I386 = xyes -o x$HAVE_CPU_AMD64 = xyes ; then
AS_COMPILER_FLAG(["-mmmx"], [MMX_CFLAGS="-mmmx"], true)
AS_COMPILER_FLAG(["-msse"], [SSE_CFLAGS="-msse"], true)
diff --git a/liboil/powerpc/Makefile.am b/liboil/powerpc/Makefile.am
index 71c6216..a6f90b4 100644
--- a/liboil/powerpc/Makefile.am
+++ b/liboil/powerpc/Makefile.am
@@ -1,6 +1,14 @@
noinst_LTLIBRARIES = libpowerpc.la
+if HAVE_ASM_BLOCKS
+asm_block_sources = \
+ recon8x8_ppc.c \
+ recon8x8_altivec.c
+else
+asm_block_sources =
+endif
+
sources = \
abs.c \
clip.c \
@@ -19,13 +27,8 @@ sources = \
splat.c \
zigzag8x8.c
-if HAVE_CPU_POWERPC
-powerpc_sources = $(sources)
-else
-powerpc_sources =
-endif
-
libpowerpc_la_SOURCES = \
- $(powerpc_sources)
+ $(asm_block_sources)
+ $(sources)
libpowerpc_la_CFLAGS = $(LIBOIL_CFLAGS) -maltivec -mabi=altivec -fasm-blocks