* configure.ac: revert to -Wa,-mregnames

* liboil/powerpc/md5.c: fixes
* liboil/powerpc/zigzag8x8.c: fixes
* liboil/powerpc/Makefile.am: move fdct8x8theora_altivec.c
* liboil/powerpc/fdct8x8theora_altivec.c: from here
* liboil/powerpc_asm_blocks/fdct8x8theora_altivec.c: to here
* liboil/powerpc_asm_blocks/Makefile.am:
* m4/as-intrinsics.m4: fix altivec test

8 files changed, 19 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 3c7a32c..789c0e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2005-11-02  David Schleef  <ds@schleef.org>
 
+	* configure.ac: revert to -Wa,-mregnames
+	* liboil/powerpc/md5.c: fixes
+	* liboil/powerpc/zigzag8x8.c: fixes
+	* liboil/powerpc/Makefile.am: move fdct8x8theora_altivec.c
+	* liboil/powerpc/fdct8x8theora_altivec.c: from here
+	* liboil/powerpc_asm_blocks/fdct8x8theora_altivec.c: to here
+	* liboil/powerpc_asm_blocks/Makefile.am:
+	* m4/as-intrinsics.m4: fix altivec test
+
+2005-11-02  David Schleef  <ds@schleef.org>
+
 	* configure.ac: Use AC_CANONICAL_HOST
 	* liboil/powerpc/Makefile.am: fix dist
 
diff --git a/configure.ac b/configure.ac
index adf1bbb..1af87b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -137,8 +137,8 @@ then
   AS_COMPILER_FLAG(-Werror, LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Werror")
 fi
 if test x$HAVE_GCC_POWERPC = xyes ; then
-  AS_COMPILER_FLAG(["-mregnames"],
-    [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -mregnames"],
+  AS_COMPILER_FLAG(["-Wa,-mregnames"],
+    [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Wa,-mregnames"],
     true)
   AS_COMPILER_FLAG(["-force_cpusubtype_ALL"],
     [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -force_cpusubtype_ALL"],
diff --git a/liboil/powerpc/Makefile.am b/liboil/powerpc/Makefile.am
index 20810ff..73851b9 100644
--- a/liboil/powerpc/Makefile.am
+++ b/liboil/powerpc/Makefile.am
@@ -6,7 +6,6 @@ sources = \
 	clip.c \
 	conv.c \
 	copy.c \
-	fdct8x8theora_altivec.c \
 	md5.c \
 	mix.c \
 	multsum.c \
diff --git a/liboil/powerpc/md5.c b/liboil/powerpc/md5.c
index acada09..63c0e68 100644
--- a/liboil/powerpc/md5.c
+++ b/liboil/powerpc/md5.c
@@ -29,8 +29,7 @@
 #include "config.h"
 #endif
 
-#include <liboil/liboil.h>
-#include "md5.h"
+#include <liboil/liboilfunction.h>
 
 #define F1(x, y, z) (z ^ (x & (y ^ z)))
 #define F2(x, y, z) F1(z, x, y)
@@ -40,6 +39,7 @@
 #define MD5STEP(f,w,x,y,z,in,s) \
   (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
 
+OIL_DECLARE_CLASS (md5);
 
 static void
 md5_asm1 (uint32_t *state, uint32_t *src)
diff --git a/liboil/powerpc/zigzag8x8.c b/liboil/powerpc/zigzag8x8.c
index 59dffa9..4b5c058 100644
--- a/liboil/powerpc/zigzag8x8.c
+++ b/liboil/powerpc/zigzag8x8.c
@@ -30,7 +30,6 @@
 #endif
 
 #include <liboil/liboil.h>
-#include "jpeg.h"
 
 
 /* Derivation:
diff --git a/liboil/powerpc_asm_blocks/Makefile.am b/liboil/powerpc_asm_blocks/Makefile.am
index 78f94b7..a730772 100644
--- a/liboil/powerpc_asm_blocks/Makefile.am
+++ b/liboil/powerpc_asm_blocks/Makefile.am
@@ -2,6 +2,7 @@
 noinst_LTLIBRARIES = libpowerpc_asm_blocks.la
 
 sources = \
+	fdct8x8theora_altivec.c \
 	recon8x8_ppc.c  \
 	recon8x8_altivec.c  
 
diff --git a/liboil/powerpc/fdct8x8theora_altivec.c b/liboil/powerpc_asm_blocks/fdct8x8theora_altivec.c
index 0bb2467..e02f85f 100644
--- a/liboil/powerpc/fdct8x8theora_altivec.c
+++ b/liboil/powerpc_asm_blocks/fdct8x8theora_altivec.c
@@ -38,7 +38,7 @@
  ********************************************************************
 
   function:
-  last mod: $Id: fdct8x8theora_altivec.c,v 1.1 2005-08-15 21:33:39 ds Exp $
+  last mod: $Id: fdct8x8theora_altivec.c,v 1.1 2005-11-03 07:00:23 ds Exp $
 
  ********************************************************************/
 
diff --git a/m4/as-intrinsics.m4 b/m4/as-intrinsics.m4
index a45a0b1..f816b19 100644
--- a/m4/as-intrinsics.m4
+++ b/m4/as-intrinsics.m4
@@ -4,7 +4,7 @@ dnl autostars m4 macro for detection of gcc inline assembly
 
 dnl David Schleef <ds@schleef.org>
 
-dnl $Id: as-intrinsics.m4,v 1.2 2005-10-29 02:32:33 ds Exp $
+dnl $Id: as-intrinsics.m4,v 1.3 2005-11-03 07:00:23 ds Exp $
 
 dnl AS_MMX_INTRINSICS(CFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED])
 dnl Tries to compile with the given CFLAGS.
@@ -173,7 +173,7 @@ AC_DEFUN([AS_ALTIVEC_INTRINSICS],
 
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -maltivec"
-  AC_TRY_COMPILE([#include <altivec.h>], [__vector_float a; a = vec_or(a,a)], [flag_ok=yes], [flag_ok=no])
+  AC_TRY_COMPILE([#include <altivec.h>], [__vector a; a = vec_or(a,a)], [flag_ok=yes], [flag_ok=no])
   CFLAGS="$save_CFLAGS"
 
   $1="-maltivec"