Bug 612429 - Fix Maemo/Android/ARM inclusion of SSE2 code - r=doublec a=roc
authorChris Double <chris.double@double.co.nz>
Thu, 18 Nov 2010 15:11:11 +1300
changeset 57886 5f0d24418e7ee87d6334b06f6571b2283b197268
parent 57885 302e3ea21728ddea642652f30e3d3b45fae0a454
child 57887 2e35085ca7cc08badf78532dff238cecf4381a47
push id17060
push usercdouble@mozilla.com
push dateFri, 19 Nov 2010 01:56:12 +0000
treeherdermozilla-central@5f0d24418e7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdoublec, roc
bugs612429
milestone2.0b8pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 612429 - Fix Maemo/Android/ARM inclusion of SSE2 code - r=doublec a=roc
gfx/ycbcr/convert.patch
gfx/ycbcr/yuv_row.h
--- a/gfx/ycbcr/convert.patch
+++ b/gfx/ycbcr/convert.patch
@@ -545,17 +545,17 @@ index 0a2990b..4ce9eb8 100644
 -#define USE_SSE2 0
 -#endif
 -#endif
 -
  // x64 uses MMX2 (SSE) so emms is not required.
  // Warning C4799: function has no EMMS instruction.
  // EMMS() is slow and should be called by the calling function once per image.
 -#if USE_MMX && !defined(ARCH_CPU_X86_64)
-+#if !defined(ARCH_CPU_X86_64)
++#if defined(ARCH_CPU_X86) && !defined(ARCH_CPU_X86_64)
  #if defined(_MSC_VER)
  #define EMMS() __asm emms
  #pragma warning(disable: 4799)
  #else
  #define EMMS() asm("emms")
  #endif
  #else
  #define EMMS()
--- a/gfx/ycbcr/yuv_row.h
+++ b/gfx/ycbcr/yuv_row.h
@@ -118,17 +118,17 @@ void LinearScaleYUVToRGB32Row_C(const ui
 #else
 #define SIMD_ALIGNED(var) var __attribute__((aligned(16)))
 #endif
 extern SIMD_ALIGNED(int16 kCoefficientsRgbY[768][4]);
 
 // x64 uses MMX2 (SSE) so emms is not required.
 // Warning C4799: function has no EMMS instruction.
 // EMMS() is slow and should be called by the calling function once per image.
-#if !defined(ARCH_CPU_X86_64)
+#if defined(ARCH_CPU_X86) && !defined(ARCH_CPU_X86_64)
 #if defined(_MSC_VER)
 #define EMMS() __asm emms
 #pragma warning(disable: 4799)
 #else
 #define EMMS() asm("emms")
 #endif
 #else
 #define EMMS()