xserver ChangeLog,3.374,3.375 configure.ac,3.104,3.105

[Billy Biggs]

Committed by: vektor

Update of /cvs/xserver/xserver
In directory gabe:/tmp/cvs-serv8004

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

	* configure.ac: 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.
	* fb/fbmmx.c: Remove CPU detection code, only include
	xmmintrin.h if USE_SSE is defined.
	* fb/fbpict.c (detectCPUFeatures), (fbHaveMMX): Move CPU
	detection code out of the MMX file and into the generic code to
	avoid compiling it with -mmmx and -msse.  Using these options
	causes gcc to use MMX and SSE instructions in the CPU detection
	code which causes SIGILLs on older processors.



Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.374
retrieving revision 3.375
diff -u -d -r3.374 -r3.375
--- ChangeLog	19 Sep 2005 03:41:46 -0000	3.374
+++ ChangeLog	19 Sep 2005 04:02:31 -0000	3.375
@@ -1,5 +1,22 @@
 2005-09-18  Billy Biggs  <vektor at dumbterm.net>
 
+	Bug #4414, reviewed by otaylor, cworth.
+
+	* configure.ac: 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.
+	* fb/fbmmx.c: Remove CPU detection code, only include
+	xmmintrin.h if USE_SSE is defined.
+	* fb/fbpict.c (detectCPUFeatures), (fbHaveMMX): Move CPU
+	detection code out of the MMX file and into the generic code to
+	avoid compiling it with -mmmx and -msse.  Using these options
+	causes gcc to use MMX and SSE instructions in the CPU detection
+	code which causes SIGILLs on older processors.
+
+2005-09-18  Billy Biggs  <vektor at dumbterm.net>
+
 	Bug #4260, fix by Owen Taylor.
  
  	* fb/fbcompose.c (fbStore_a8b8g8r8, fbStore_x8b8g8r8): Use & not

Index: configure.ac
===================================================================
RCS file: /cvs/xserver/xserver/configure.ac,v
retrieving revision 3.104
retrieving revision 3.105
diff -u -d -r3.104 -r3.105
--- configure.ac	8 Aug 2005 06:25:19 -0000	3.104
+++ configure.ac	19 Sep 2005 04:02:31 -0000	3.105
@@ -540,7 +540,7 @@
  AC_MSG_RESULT(no),
  AC_MSG_RESULT(assuming not on target machine))
 
-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)
@@ -551,10 +551,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