diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-02-09 23:20:27 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-02-09 23:20:27 +0000 |
| commit | e9bd590781dc049b66d6d6a4c2337478bc8907ec (patch) | |
| tree | e9c0ca50813eaf54acb837e1c49a13c2b25f5ff0 | |
| parent | 456480981a8c97242f7a304fbe45d7b908fc9d43 (diff) | |
minor changes from XFree86 (dawes)
| -rw-r--r-- | src/mesa/x86/common_x86_asm.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S index ac4065ee26..9b1fcfa9c5 100644 --- a/src/mesa/x86/common_x86_asm.S +++ b/src/mesa/x86/common_x86_asm.S @@ -1,4 +1,4 @@ -/* $Id: common_x86_asm.S,v 1.1.2.2 2000/12/06 11:14:59 gareth Exp $ */ +/* $Id: common_x86_asm.S,v 1.1.2.3 2001/02/09 23:20:27 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -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 |