[Liboil-commit] 7 commits - Makefile.am configure.ac liboil/Makefile.am liboil/arm liboil/sse
David Schleef
ds at kemper.freedesktop.org
Thu Feb 4 12:34:56 PST 2010
Makefile.am | 2 +-
configure.ac | 17 +++++++++--------
liboil/Makefile.am | 4 ++++
liboil/arm/math_vfp.c | 2 +-
liboil/arm/math_vfp_asm.S | 2 +-
liboil/sse/math_sse.c | 2 +-
liboil/sse/math_sse_unroll2.c | 2 +-
7 files changed, 18 insertions(+), 13 deletions(-)
New commits:
commit 946e7298b6db2e1821ef6a89af79c9529893fa9a
Author: Dmitry V. Levin <ldv at altlinux.org>
Date: Mon Jan 4 20:54:12 2010 +0000
Use both AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS
libtoolize(1) tool suggests adding AC_CONFIG_MACRO_DIR macro to
configure.ac, and gtkdocize tool also uses AC_CONFIG_MACRO_DIR from
configure.ac to find out where to install gtk-doc.m4 file.
According to libtool documentation at
http://www.gnu.org/software/libtool/manual/html_node/Invoking-libtoolize.html
"If libtoolize detects an explicit call to AC_CONFIG_MACRO_DIR (see The
Autoconf Manual) in your configure.ac, it will put the Libtool macros in
the specified directory.
In the future other Autotools will automatically check the contents of
AC_CONFIG_MACRO_DIR, but at the moment it is more portable to add the
macro directory to ACLOCAL_AMFLAGS in Makefile.am, which is where the
tools currently look. If libtoolize doesn't see AC_CONFIG_MACRO_DIR, it
too will honour the first ‘-I’ argument in ACLOCAL_AMFLAGS when choosing
a directory to store libtool configuration macros in. It is perfectly
sensible to use both AC_CONFIG_MACRO_DIR and ACLOCAL_AMFLAGS, as long as
they are kept in synchronisation."
Fixed #25927
diff --git a/Makefile.am b/Makefile.am
index a6cf4ef..906bd25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,5 +19,5 @@ BUILT_SOURCES=liboil-$(LIBOIL_MAJORMINOR)-uninstalled.pc
CLEANFILES = liboil-$(LIBOIL_MAJORMINOR).pc liboil-$(LIBOIL_MAJORMINOR)-uninstalled.pc
-ACLOCAL_FLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 9fb75c8..835e5d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,7 @@ AC_PROG_LIBTOOL
AM_PROG_AS
AC_CONFIG_SRCDIR([liboil/liboil.h])
-
-ACLOCAL_AMFLAGS="-I m4 $ACLOCAL_AMFLAGS"
-AC_SUBST(ACLOCAL_AMFLAGS)
+AC_CONFIG_MACRO_DIR([m4])
PKG_CHECK_MODULES(GLIB, glib-2.0, HAVE_GLIB=yes, HAVE_GLIB=no)
AC_SUBST(GLIB_LIBS)
commit 2c13c258328321f92e7e1a40fe34506e8c855120
Author: David Schleef <ds at schleef.org>
Date: Thu Feb 4 12:14:32 2010 -0800
Use mm_load1_pd() instead of mm_load1_pd1()
Fixes #23840. Patch from Rafał Rzepecki.
diff --git a/liboil/sse/math_sse.c b/liboil/sse/math_sse.c
index eb32f49..be63ace 100644
--- a/liboil/sse/math_sse.c
+++ b/liboil/sse/math_sse.c
@@ -353,7 +353,7 @@ scalarmultiply_f64_ns_sse2 (double *dest, double *src1, double *val, int n)
for (; ((long)dest & 15) && (n > 0); n--) {
*dest++ = *src1++ * *val;
}
- xmm1 = _mm_load_pd1(val);
+ xmm1 = _mm_load1_pd(val);
for (; n >= 2; n -= 2) {
__m128d xmm0;
xmm0 = _mm_loadu_pd(src1);
diff --git a/liboil/sse/math_sse_unroll2.c b/liboil/sse/math_sse_unroll2.c
index 4598c6e..e596500 100644
--- a/liboil/sse/math_sse_unroll2.c
+++ b/liboil/sse/math_sse_unroll2.c
@@ -326,7 +326,7 @@ scalarmultiply_f64_ns_sse2_unroll2 (double *dest, double *src1, double *val, int
for (; ((long)dest & 15) && (n > 0); n--) {
*dest++ = *src1++ * *val;
}
- xmm1 = _mm_load_pd1(val);
+ xmm1 = _mm_load1_pd(val);
for (; n >= 4; n -= 4) {
__m128d xmm0;
xmm0 = _mm_loadu_pd(src1);
commit c81b93577ea5bc962217e64d21c4356524df8cf9
Author: David Schleef <ds at schleef.org>
Date: Thu Feb 4 12:10:16 2010 -0800
Disable motovec
Fixes #20815
diff --git a/liboil/Makefile.am b/liboil/Makefile.am
index 4991a34..84a61ae 100644
--- a/liboil/Makefile.am
+++ b/liboil/Makefile.am
@@ -39,6 +39,10 @@ if HAVE_POWERPC
if HAVE_GCC_ASM
SUBDIRS += powerpc motovec
libs += powerpc/libpowerpc.la motovec/libmotovec.la
+
+# motovec doesn't compile on snow leopard, and isn't useful elsewhere
+#SUBDIRS += motovec
+#libs += motovec/libmotovec.la
if HAVE_ASM_BLOCKS
SUBDIRS += powerpc_asm_blocks
libs += powerpc/libpowerpc_asm_blocks.la
commit 227782d45d14ca0d68ee73b54eab71c1582dcbfa
Author: Adrian Bunk <adrian.bunk at movial.com>
Date: Wed Sep 9 16:31:40 2009 +0300
fix ARM -mfloat-abi=soft builds
If __SOFTFP__ is defined, VFP support is not available
even when __VFP_FP__ is defined.
diff --git a/liboil/arm/math_vfp.c b/liboil/arm/math_vfp.c
index ffd3981..0bed96e 100644
--- a/liboil/arm/math_vfp.c
+++ b/liboil/arm/math_vfp.c
@@ -30,7 +30,7 @@
#include <liboil/liboilclasses.h>
#include <liboil/liboilfunction.h>
-#if __VFP_FP__
+#if defined(__VFP_FP__) && !defined(__SOFTFP__)
extern void vfp_add_f32 (float *d, const float *s1, const float *s2, int n);
extern void vfp_add_f64 (double *d, const double *s1, const double *s2, int n);
diff --git a/liboil/arm/math_vfp_asm.S b/liboil/arm/math_vfp_asm.S
index ea68dba..ae5c803 100644
--- a/liboil/arm/math_vfp_asm.S
+++ b/liboil/arm/math_vfp_asm.S
@@ -24,7 +24,7 @@
* SUCH DAMAGE.
*/
-#if __VFP_FP__
+#if defined(__VFP_FP__) && !defined(__SOFTFP__)
/*
** compile with -mcpu=arm1136j-s -mfpu=vfp -mfloat-abi=softfp
**
commit 7a154119019b14aa532c73e635be4e4905f0652e
Author: David Schleef <ds at schleef.org>
Date: Thu Feb 4 11:53:30 2010 -0800
Add --enable-vfp
Patch from Kalle Vahlman. Fixes #12454
diff --git a/configure.ac b/configure.ac
index e944f0d..9fb75c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -187,7 +187,10 @@ if test x$HAVE_GCC_ASM = xyes -a x$HAVE_POWERPC = xyes ; then
true)
fi
-if test x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes ; then
+AC_ARG_ENABLE(vfp,
+ AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]),
+ enable_vfp=$enableval,enable_vfp=yes)
+if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
[VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"],
true)
commit af11ff56eacf1e5d6890db5f6e302dcdcf3c0035
Author: David Schleef <ds at schleef.org>
Date: Thu Feb 4 11:50:51 2010 -0800
Disable --enable-new-abi
diff --git a/configure.ac b/configure.ac
index 445e233..e944f0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,9 +65,9 @@ if test "x$enable_broken_implementations" = xyes ; then
AC_DEFINE(ENABLE_BROKEN_IMPLS, 1, [Define if compiling broken implementations])
fi
-AC_ARG_ENABLE(new-abi,
- AC_HELP_STRING([--enable-new-abi],[enable experimental 0.4 ABI]),
- enable_new_abi=$enableval,enable_new_abi=no)
+#AC_ARG_ENABLE(new-abi,
+# AC_HELP_STRING([--enable-new-abi],[enable experimental 0.4 ABI]),
+# enable_new_abi=$enableval,enable_new_abi=no)
if test "x$enable_new_abi" = xyes ; then
AC_DEFINE(ENABLE_NEW_ABI, 1, [Define if compiling new ABI])
fi
commit d30d9b2fad819574c92314dc58e24decaeb563e3
Author: David Schleef <ds at schleef.org>
Date: Thu Feb 4 11:48:36 2010 -0800
ac_sys_symbol_underscore is now lt_
Fixes #23396.
diff --git a/configure.ac b/configure.ac
index 8145e64..445e233 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,7 @@ AC_C_BIGENDIAN
AS_UNALIGNED_ACCESS
AC_LTDL_SYMBOL_USCORE
-if test x${ac_cv_sys_symbol_underscore} = xyes ; then
+if test x${lt_cv_sys_symbol_underscore} = xyes ; then
AC_DEFINE(HAVE_SYMBOL_UNDERSCORE, 1, [Define if C symbols have leading underscore])
fi
More information about the Liboil-commit
mailing list