[cairo-commit] cairo ChangeLog, 1.1026.2.9, 1.1026.2.10 configure.in, 1.140.2.1, 1.140.2.2

[Billy Biggs]

Committed by: vektor

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv1922

Modified Files:
      Tag: BRANCH_1_0
	ChangeLog configure.in 
Log Message:
	Bug #4414, reviewed by otaylor, cworth.

	* configure.in: Remove -msse from the MMX CFLAGS as it causes
	gcc to emit SSE instructions, however the detection code only
	checks for processors supporting MMX and does not require SSE.
	Fix the MMX test to only check for MMX intrinsics and not the
	SSE intrinsics.



Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.1026.2.9
retrieving revision 1.1026.2.10
diff -u -d -r1.1026.2.9 -r1.1026.2.10
--- ChangeLog	16 Sep 2005 17:25:40 -0000	1.1026.2.9
+++ ChangeLog	19 Sep 2005 02:56:32 -0000	1.1026.2.10
@@ -1,3 +1,13 @@
+2005-09-18  Billy Biggs  <vektor at dumbterm.net>
+
+	Bug #4414, reviewed by otaylor, cworth.
+
+	* configure.in: Remove -msse from the MMX CFLAGS as it causes
+	gcc to emit SSE instructions, however the detection code only
+	checks for processors supporting MMX and does not require SSE.
+	Fix the MMX test to only check for MMX intrinsics and not the
+	SSE intrinsics.
+
 2005-09-16  Carl Worth  <cworth at cworth.org>
 
         Tested by: John Ellson

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.140.2.1
retrieving revision 1.140.2.2
diff -u -d -r1.140.2.1 -r1.140.2.2
--- configure.in	12 Sep 2005 18:11:48 -0000	1.140.2.1
+++ configure.in	19 Sep 2005 02:56:32 -0000	1.140.2.2
@@ -474,7 +474,7 @@
 dnl ===========================================================================
 dnl Check for MMX
 
-MMX_CFLAGS="-mmmx -msse -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
+MMX_CFLAGS="-mmmx -Winline --param inline-unit-growth=10000 --param large-function-growth=10000"
 
 have_mmx_intrinsics=no
 AC_MSG_CHECKING(For MMX/SSE intrinsics in the compiler)
@@ -485,10 +485,10 @@
 #error "Need GCC >= 3.4 for MMX intrinsics"
 #endif
 #include <mmintrin.h>
-#include <xmmintrin.h>
 int main () {
     __m64 v = _mm_cvtsi32_si64 (1);
-    v = _mm_shuffle_pi16 (v, _MM_SHUFFLE(3, 3, 3, 3));
+    __m64 w = _mm_slli_si64 (v, 1);
+    v = _mm_or_si64 (v, w);
     return _mm_cvtsi64_si32 (v);
 }], have_mmx_intrinsics=yes)
 CFLAGS=$xserver_save_CFLAGS