summaryrefslogtreecommitdiff
path: root/xc/extras
diff options
context:
space:
mode:
authorbrianp <brianp>2001-06-06 18:39:05 +0000
committerbrianp <brianp>2001-06-06 18:39:05 +0000
commit35511ca8b7653ab930a45a50dc54ad16983a2c70 (patch)
tree28354f234720fc2f6923b9a4a1a049fea6442e44 /xc/extras
parent109fea92b5a62e2213c792c403f978e9ce64e5cb (diff)
sync with Mesa 3.4 X86_FXSR_MAGIC change
Diffstat (limited to 'xc/extras')
-rw-r--r--xc/extras/Mesa/src/X86/common_x86.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/xc/extras/Mesa/src/X86/common_x86.c b/xc/extras/Mesa/src/X86/common_x86.c
index 872c54515..162b1941f 100644
--- a/xc/extras/Mesa/src/X86/common_x86.c
+++ b/xc/extras/Mesa/src/X86/common_x86.c
@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <stdio.h>
-#if defined(USE_KATMAI_ASM) && defined(__linux__) && defined(_POSIX_SOURCE)
+#if defined(USE_KATMAI_ASM) && defined(__linux__)
#include <signal.h>
#endif
@@ -87,7 +87,7 @@ static void message( const char *msg )
extern void gl_test_os_katmai_support( void );
extern void gl_test_os_katmai_exception_support( void );
-#if defined(__linux__) && defined(_POSIX_SOURCE)
+#if defined(__linux__) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
static void sigill_handler( int signal, struct sigcontext sc )
{
message( "SIGILL, " );
@@ -125,7 +125,7 @@ static void sigfpe_handler( int signal, struct sigcontext sc )
gl_problem( NULL, "SSE enabling test failed badly!" );
}
}
-#endif /* __linux__ && _POSIX_SOURCE */
+#endif /* __linux__ && _POSIX_SOURCE && X86_FXSR_MAGIC */
/* If we're running on a processor that can do SSE, let's see if we
* are allowed to or not. This will catch 2.4.0 or later kernels that
@@ -138,7 +138,7 @@ static void sigfpe_handler( int signal, struct sigcontext sc )
static void check_os_katmai_support( void )
{
#if defined(__linux__)
-#if defined(_POSIX_SOURCE)
+#if defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
struct sigaction saved_sigill;
struct sigaction saved_sigfpe;
@@ -212,7 +212,7 @@ static void check_os_katmai_support( void )
*/
message( "Cannot test OS support for SSE, disabling to be safe.\n" );
gl_x86_cpu_features &= ~(X86_FEATURE_XMM);
-#endif /* _POSIX_SOURCE */
+#endif /* _POSIX_SOURCE && X86_FXSR_MAGIC */
#else
/* Do nothing on non-Linux platforms for now.
*/