From a0609a5e50adff953dc6f49e6ee896dba3d3864a Mon Sep 17 00:00:00 2001 From: DRC Date: Wed, 3 Mar 2010 08:46:29 +0000 Subject: [PATCH] Don't allow code path to be forced on a system that doesn't support it --- simd/jsimd_i386.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/simd/jsimd_i386.c b/simd/jsimd_i386.c index ed1339b2..66af0248 100644 --- a/simd/jsimd_i386.c +++ b/simd/jsimd_i386.c @@ -48,16 +48,16 @@ init_simd (void) /* Force different settings through environment variables */ env = getenv("JSIMD_FORCEMMX"); if ((env != NULL) && (strcmp(env, "1") == 0)) - simd_support = JSIMD_MMX; + simd_support &= JSIMD_MMX; env = getenv("JSIMD_FORCE3DNOW"); if ((env != NULL) && (strcmp(env, "1") == 0)) - simd_support = JSIMD_3DNOW|JSIMD_MMX; + simd_support &= JSIMD_3DNOW|JSIMD_MMX; env = getenv("JSIMD_FORCESSE"); if ((env != NULL) && (strcmp(env, "1") == 0)) - simd_support = JSIMD_SSE|JSIMD_MMX; + simd_support &= JSIMD_SSE|JSIMD_MMX; env = getenv("JSIMD_FORCESSE2"); if ((env != NULL) && (strcmp(env, "1") == 0)) - simd_support = JSIMD_SSE2; + simd_support &= JSIMD_SSE2; } GLOBAL(int)