From 25bbecd64e6b9f101cc6739862aee348dcfc47ed Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Thu, 18 Feb 2010 14:30:01 +0900 Subject: [PATCH] Compile by USE_SSE2 only without USE_MMX Althouhg we added MMX emulation for Microsoft Visual C++ compiler for x64, USE_SSE2 still requires USE_MMX. So we remove dependency of USE_MMX for Windows x64. Signed-off-by: Makoto Kato --- pixman/pixman-cpu.c | 2 +- pixman/pixman-sse2.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/pixman/pixman-cpu.c b/pixman/pixman-cpu.c index d727ddb..e96b140 100644 --- a/pixman/pixman-cpu.c +++ b/pixman/pixman-cpu.c @@ -309,7 +309,7 @@ pixman_have_arm_neon (void) #endif /* USE_ARM_SIMD || USE_ARM_NEON */ -#ifdef USE_MMX +#if defined(USE_MMX) || defined(USE_SSE2) /* The CPU detection code needs to be in a file not compiled with * "-mmmx -msse", as gcc would generate CMOV instructions otherwise * that would lead to SIGILL instructions on old CPUs that don't have diff --git a/pixman/pixman-sse2.c b/pixman/pixman-sse2.c index 2bade74..c93c4a3 100644 --- a/pixman/pixman-sse2.c +++ b/pixman/pixman-sse2.c @@ -5955,7 +5955,11 @@ __attribute__((__force_align_arg_pointer__)) pixman_implementation_t * _pixman_implementation_create_sse2 (void) { +#ifdef USE_MMX pixman_implementation_t *mmx = _pixman_implementation_create_mmx (); +#else + pixman_implementation_t *mmx = _pixman_implementation_create_fast_path (); +#endif pixman_implementation_t *imp = _pixman_implementation_create (mmx); /* SSE2 constants */ -- 1.6.6