minor changes from XFree86 (dawes)

diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index bb75830eb4764d5ec0813c4b16a1955259091dec..80ee4f8d0808122c226a73c55ae66b520094aa12 100644 (file)
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -1,8 +1,8 @@
-/* $Id: common_x86_asm.S,v 1.3 2000/12/06 14:41:47 gareth Exp $ */
+/* $Id: common_x86_asm.S,v 1.4 2001/02/09 23:23:43 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  3.4
  *
  * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
  *
@@ -33,6 +33,7 @@
  *
  * Cleaned up and simplified by Gareth Hughes <gareth@valinux.com>
  */
+/* $XFree86: xc/extras/Mesa/src/X86/common_x86_asm.S,v 1.5 2000/12/12 23:52:37 dawes Exp $ */
 
 #include "assyntax.h"
 #include "common_x86_features.h"
@@ -58,8 +59,10 @@
 GLNAME( found_intel ): STRING( "Genuine Intel processor found\n\0" )
 GLNAME( found_amd ):   STRING( "Authentic AMD processor found\n\0" )
 
+#ifdef USE_KATMAI_ASM
 GLNAME( katmai_test_dummy ):
        D_LONG 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000
+#endif
 
 
        SEG_TEXT
@@ -155,6 +158,7 @@ LLBL ( cpuid_done ):
        RET
 
 
+#ifdef USE_KATMAI_ASM
 /* Execute an SSE instruction to see if the operating system correctly
  * supports SSE.  A signal handler for SIGILL should have been set
  * before calling this function, otherwise this could kill the client
@@ -203,3 +207,5 @@ GLNAME( gl_test_os_katmai_exception_support ):
 
        LEAVE
        RET
+
+#endif